Commit ea89a75d1816f3ab7822099eac5f3a4463a7de69

Authored by Karpikau Andrei
1 parent 36fa45d7

test

... ... @@ -44,16 +44,6 @@
44 44 </provider>
45 45 </entry>
46 46 </file>
47   - <file leaf-file-name="general.js" pinned="false" current-in-tab="false">
48   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general.js">
49   - <provider selected="true" editor-type-id="text-editor">
50   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="135">
51   - <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="24" />
52   - <folding />
53   - </state>
54   - </provider>
55   - </entry>
56   - </file>
57 47 <file leaf-file-name="general_admin.js" pinned="false" current-in-tab="false">
58 48 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js">
59 49 <provider selected="true" editor-type-id="text-editor">
... ... @@ -122,6 +112,16 @@
122 112 </provider>
123 113 </entry>
124 114 </file>
  115 + <file leaf-file-name="image.rb" pinned="false" current-in-tab="false">
  116 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/image.rb">
  117 + <provider selected="true" editor-type-id="text-editor">
  118 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
  119 + <caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
  120 + <folding />
  121 + </state>
  122 + </provider>
  123 + </entry>
  124 + </file>
125 125 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
126 126 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
127 127 <provider selected="true" editor-type-id="text-editor">
... ... @@ -137,7 +137,6 @@
137 137 <component name="IdeDocumentHistory">
138 138 <option name="CHANGED_PATHS">
139 139 <list>
140   - <option value="$PROJECT_DIR$/config/initializers/devise.rb" />
141 140 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/sessions_controller.rb" />
142 141 <option value="$PROJECT_DIR$/app/views/devise/sessions/new.html.erb" />
143 142 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general.js" />
... ... @@ -187,6 +186,7 @@
187 186 <option value="$PROJECT_DIR$/lib/kanjai.rb" />
188 187 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
189 188 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
  189 + <option value="$PROJECT_DIR$/app/models/kanjai/image.rb" />
190 190 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
191 191 </list>
192 192 </option>
... ... @@ -991,6 +991,14 @@
991 991 </state>
992 992 </provider>
993 993 </entry>
  994 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/image.rb">
  995 + <provider selected="true" editor-type-id="text-editor">
  996 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
  997 + <caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
  998 + <folding />
  999 + </state>
  1000 + </provider>
  1001 + </entry>
994 1002 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
995 1003 <provider selected="true" editor-type-id="text-editor">
996 1004 <state vertical-scroll-proportion="0.036057692" vertical-offset="0" max-vertical-offset="416">
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.2)
  4 + kanjai (0.0.3)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ...
... ... @@ -2,11 +2,11 @@ module Kanjai
2 2 class Image < ActiveRecord::Base
3 3 belongs_to :object, polymorphic: true
4 4
5   - has_attached_file :image,
6   - :styles => {:mini => '200x200>'},
7   - :path => ":object_type/:object_id/images/:id/:style/:basename.:extension",
8   - :s3_permissions => :public_read,
9   - :url => ':s3_domain_url'
  5 +# has_attached_file :image,
  6 +# :styles => {:mini => '200x200>'},
  7 +# :path => ":object_type/:object_id/images/:id/:style/:basename.:extension",
  8 +# :s3_permissions => :public_read,
  9 +# :url => ':s3_domain_url'
10 10
11 11
12 12 def get_file_path
... ...
1 1 module Kanjai
2   - VERSION = "0.0.3"
  2 + VERSION = "0.0.4"
3 3 end
... ...