phocoder-rails 0.0.55 → 0.0.56

data/README.md

@@ -9,7 +9,7 @@ with the [Phocoder](http://www.phocoder.com/) image processing service.
 Add this to your Gemfile:
 
 ```ruby
-gem "phocoder-rails"
+gem "phocoder-rails", :require => 'phocoder_rails'
 ```
 
 And then run:
@@ -54,15 +54,30 @@ create  app/views/image_uploads/show.html.erb
  route  resources :image_uploads, :except=>[:edit,:update]
 ```
 
+Then run
+
+```term
+rake db:migrate
+```
+
 ## Updating an existing model
 
-First generate a migration that will add some extra columns to your table.  You should red the migration
-after it is generated to make sure that it makes sense within the context of your model.
+You can also update an existing model.  First generate a migration that will add some extra columns to your
+table.  
 
 ```term
 rails g phocoder_rails:model_update my_model
 ```
 
+You should read the migration after it is generated to make 
+sure that it makes sense within the context of your model.
+
+Then run
+
+```term
+rake db:migrate
+```
+
 Then you should make sure that your form is set up for multi part encoding, and that you have a `file_field`
 in your form named `file`.
 
@@ -88,9 +103,9 @@ class ImageUpload < ActiveRecord::Base
       {:label=>"medium", :width=>400, :height=>400, :aspect_mode => 'preserve',
         :frame=>{ :width=>20, :bottom=>50, :color=>'003' },
         :annotations=>[
-                        {:text=>"Annotation Testing",:pointsize=>30,:fill_color=>'fff',:gravity=>"South",:y=>10},
-                        {:text=>"Howdy!",:pointsize=>10,:fill_color=>'ccc',:gravity=>"North",:y=>5}
-                      ]
+          {:text=>"Annotation Testing",:pointsize=>30,:fill_color=>'fff',:gravity=>"South",:y=>10},
+          {:text=>"Howdy!",:pointsize=>10,:fill_color=>'ccc',:gravity=>"North",:y=>5}
+        ]
       }
     ]
 
@@ -105,4 +120,4 @@ and on the bottom of the image.
 [Add images]
 
 
-## Storage and Processing Modes
+## Storage and Processing Modes

data/VERSION

@@ -1,4 +1,4 @@
-0.0.55
+0.0.56
 
 
 

data/lib/generators/phocoder_rails/templates/views/index.html.erb.tt

@@ -8,7 +8,7 @@
 
   </tr>
 
-<%% @<%= file_name %>.each do |<%= file_name.singularize %>| %>
+<%% @<%= file_name.pluralize %>.each do |<%= file_name.singularize %>| %>
   <tr>
     <td>
     	<%%= phocoder_thumbnail <%= file_name.singularize %>,"small",false %><br/>

data/lib/generators/phocoder_rails/templates/views/new.html.erb.tt

@@ -2,4 +2,4 @@
 
 <%%= render 'form' %>
 
-<%%= link_to 'Back', <%= file_name %>_path %>
+<%%= link_to 'Back', <%= file_name.pluralize %>_path %>

data/lib/generators/phocoder_rails/templates/views/show.html.erb.tt

@@ -9,4 +9,4 @@
 
 <br/>
 
-<%%= link_to 'Back', <%= file_name %>_path %>
+<%%= link_to 'Back', <%= file_name.pluralize %>_path %>

data/lib/phocoder_rails/acts_as_phocodable.rb

@@ -200,7 +200,9 @@ module ActsAsPhocodable
   def acts_as_phocodable(options = { })
     
     include InstanceMethods
-    include Spawn
+    if defined? Spawn
+      include Spawn
+    end
     attr_reader :saved_file
     attr_accessor :phocoding
     after_save :save_local_file
@@ -1075,10 +1077,10 @@ module ActsAsPhocodable
           @saved_a_new_file = true
           self.save
         end
-        if ActsAsPhocodable.storeage_mode == "s3" and ActsAsPhocodable.processing_mode == "automatic"
+        if ActsAsPhocodable.storeage_mode == "s3" && ActsAsPhocodable.processing_mode == "automatic"
           self.save_s3_file
         end
-        if ActsAsPhocodable.storeage_mode == "s3" and ActsAsPhocodable.processing_mode == "spawn"
+        if ActsAsPhocodable.storeage_mode == "s3" && ActsAsPhocodable.processing_mode == "spawn" && defined?(Spawn)
           spawn do # :method => :thread # <-- I think that should be set at the config/environment level
             Rails.logger.debug "------------beginning of spawn block"
             #puts               "------------beginning of spawn block"
@@ -1087,7 +1089,7 @@ module ActsAsPhocodable
             #puts               "------------end of spawn block"
           end
         end
-        if ActsAsPhocodable.storeage_mode == "local" and ActsAsPhocodable.processing_mode == "automatic" 
+        if ActsAsPhocodable.storeage_mode == "local" && ActsAsPhocodable.processing_mode == "automatic" 
           self.encode
         end
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phocoder-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.55
+  version: 0.0.56
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -300,6 +300,8 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- app/assets/javascripts/phocodable.js
+- app/assets/stylesheets/phocodable.css
 - app/controllers/phocoder_controller.rb
 - app/helpers/phocoder_helper.rb
 - app/models/encodable_job.rb
@@ -336,7 +338,6 @@ files:
 - public/images/play_small.png
 - public/images/storing.gif
 - public/images/waiting.gif
-- public/javascripts/phocodable.js
 - public/javascripts/video-js-2.0.2/LICENSE.txt
 - public/javascripts/video-js-2.0.2/README.markdown
 - public/javascripts/video-js-2.0.2/demo-subtitles.srt
@@ -346,7 +347,6 @@ files:
 - public/javascripts/video-js-2.0.2/skins/vim.css
 - public/javascripts/video-js-2.0.2/video-js.css
 - public/javascripts/video-js-2.0.2/video.js
-- public/stylesheets/phocodable.css
 - spec/controllers/phocoder_controller_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
@@ -425,7 +425,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3838405062470515638
+      hash: -3998073261859968829
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -434,7 +434,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3838405062470515638
+      hash: -3998073261859968829
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24