esp-commons 0.1.6 → 0.1.7

data/app/models/esp_commons/image.rb

@@ -1,27 +1,36 @@
-class EspCommons::Image < APISmith::Smash
-  property :url
-  property :description
-  property :thumbnail
+require 'active_attr'
 
-  property :vfs_url
-  property :id,         :transformer => :to_i
-  property :width,      :transformer => :to_i
-  property :height,     :transformer => :to_i
-  property :filename
+class EspCommons::Image
+  include ActiveAttr::Attributes
+  include ActiveAttr::MassAssignment
+  include ActiveAttr::QueryAttributes
+  include ActiveAttr::TypecastedAttributes
+
+  attribute :url
+  attribute :description
+  attribute :thumbnail
+
+  attribute :vfs_url
+  attribute :id,          :type => Integer
+  attribute :width,       :type => Integer
+  attribute :height,      :type => Integer
+  attribute :crop,        :type => Boolean
+  attribute :filename
 
 
   attr_writer :aspect_ratio
 
   def parse_url
     self.tap do | image |
-      image.vfs_url, image.id, image.width, image.height, image.filename = url.match(%r{(.*)/files/(\d+)/(?:(\d+)-(\d+)/)?(.*)})[1..-1]
+      image.vfs_url, image.id, image.width, image.height, image.crop, image.filename =
+        url.match(%r{(.*)/files/(\d+)/(?:(\d+)-(\d+)(\!)?/)?(.*)})[1..-1]
     end
   end
 
   def build_url
     self.tap do | image |
       if image?
-        image.url = "#{vfs_url}/files/#{image.id}/#{image.width}-#{image.height}/#{image.filename}"
+        image.url = "#{vfs_url}/files/#{image.id}/#{image.width}-#{image.height}#{image.crop ? '!' : ''}/#{image.filename}"
       else
         image.url = "#{vfs_url}/files/#{image.id}/#{image.filename}"
       end
@@ -29,15 +38,7 @@ class EspCommons::Image < APISmith::Smash
   end
 
   def image?
-    width && height
-  end
-
-  def width?
-    width && width > 0
-  end
-
-  def height?
-    height && height > 0
+    width? && height?
   end
 
   def aspect_ratio
@@ -52,10 +53,12 @@ class EspCommons::Image < APISmith::Smash
       self.width = new_width
     else
       self.width = self.height = 100 if !width? && !height?
-      if height >= new_height
-        self.height = new_height
-      else
-        self.width = new_width
+      unless crop
+        if height >= new_height
+          self.height = new_height
+        else
+          self.width = new_width
+        end
       end
     end
     self

data/lib/esp-commons/engine.rb

@@ -1,6 +1,5 @@
 require 'airbrake'
 require 'configliere'
-require 'api_smith'
 
 module EspCommons
   class Engine < ::Rails::Engine

data/lib/esp-commons/version.rb

@@ -1,3 +1,3 @@
 module EspCommons
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/generators/esp_commons/install/script/update_site

@@ -2,10 +2,14 @@
 
 PROJECT=$(basename $(dirname $(dirname $(realpath $0))))
 
-git checkout
+git checkout Gemfile.lock
 git pull
 bundle --path .bundle --binstubs --clean
 bin/rake db:migrate
 if [ -f /usr/local/etc/rc.d/esp-${PROJECT} ]; then
   /usr/local/etc/rc.d/esp-${PROJECT} restart
 fi
+bin/rake assets:precompile
+if [ -f /usr/local/etc/rc.d/esp-${PROJECT} ]; then
+  /usr/local/etc/rc.d/esp-${PROJECT} restart
+fi

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esp-commons
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-11 00:00:00.000000000 Z
+date: 2012-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake
-  requirement: &20883040 !ruby/object:Gem::Requirement
+  requirement: &6507580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20883040
+  version_requirements: *6507580
 - !ruby/object:Gem::Dependency
   name: configliere
-  requirement: &20880880 !ruby/object:Gem::Requirement
+  requirement: &6506780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20880880
+  version_requirements: *6506780
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &20880000 !ruby/object:Gem::Requirement
+  requirement: &6506180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +43,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20880000
+  version_requirements: *6506180
 - !ruby/object:Gem::Dependency
-  name: api_smith
-  requirement: &20878320 !ruby/object:Gem::Requirement
+  name: active_attr
+  requirement: &6505380 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0.alpha.2
   type: :runtime
   prerelease: false
-  version_requirements: *20878320
+  version_requirements: *6505380
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &20892220 !ruby/object:Gem::Requirement
+  requirement: &6504600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20892220
+  version_requirements: *6504600
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &20890760 !ruby/object:Gem::Requirement
+  requirement: &6503700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20890760
+  version_requirements: *6503700
 description: Description of EspCommons.
 email:
 - mail@openteam.ru
@@ -86,17 +86,17 @@ extra_rdoc_files: []
 files:
 - app/models/esp_commons/image.rb
 - config/initializers/sunspot.rb
-- config/locales/commons.ru.yml
-- config/locales/datetime.ru.yml
 - config/unicorn.rb
+- config/locales/datetime.ru.yml
+- config/locales/commons.ru.yml
+- lib/generators/esp_commons/install/install_generator.rb
+- lib/generators/esp_commons/install/script/update_site
+- lib/generators/esp_commons/install/script/start_site
+- lib/generators/esp_commons/install/config/schedule.rb
+- lib/generators/esp_commons/install/config/unicorn.rb
 - lib/esp-commons/engine.rb
 - lib/esp-commons/version.rb
 - lib/esp-commons.rb
-- lib/generators/esp_commons/install/config/schedule.rb
-- lib/generators/esp_commons/install/config/unicorn.rb
-- lib/generators/esp_commons/install/install_generator.rb
-- lib/generators/esp_commons/install/script/start_site
-- lib/generators/esp_commons/install/script/update_site
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
@@ -114,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3363018066665106858
+      hash: 1048902172365005320
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -123,10 +123,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3363018066665106858
+      hash: 1048902172365005320
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Summary of EspCommons.