brightcontent-attachments 2.0.29 → 2.0.30

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    brightcontent-attachments (2.0.29)
-      brightcontent-core (= 2.0.29)
+    brightcontent-attachments (2.0.30)
+      brightcontent-core (= 2.0.30)
       jquery-fileupload-rails
       paperclip
 
 PATH
   remote: ../core
   specs:
-    brightcontent-core (2.0.29)
+    brightcontent-core (2.0.30)
       bcrypt-ruby
       bootstrap-wysihtml5-rails
       has_scope
@@ -23,66 +23,66 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.9)
-      actionpack (= 3.2.9)
-      mail (~> 2.4.4)
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-    activesupport (3.2.9)
-      i18n (~> 0.6)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    addressable (2.3.2)
+    addressable (2.3.3)
     arel (3.0.2)
     bcrypt-ruby (3.0.1)
     bootstrap-wysihtml5-rails (0.3.1.19)
       railties (>= 3.0)
     builder (3.0.4)
-    capybara (2.0.1)
+    capybara (2.0.3)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 1.0.0)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
     climate_control (0.0.3)
       activesupport (>= 3.0)
     cocaine (0.5.1)
       climate_control (>= 0.0.3, < 1.0)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.1)
     erubis (2.7.0)
-    factory_girl (4.1.0)
+    factory_girl (4.2.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.1.0)
-      factory_girl (~> 4.1.0)
+    factory_girl_rails (4.2.1)
+      factory_girl (~> 4.2.0)
       railties (>= 3.0.0)
-    ffi (1.2.0)
+    ffi (1.6.0)
     has_scope (0.5.1)
     hike (1.2.1)
     i18n (0.6.1)
-    inherited_resources (1.3.1)
+    inherited_resources (1.4.0)
       has_scope (~> 0.5.0)
-      responders (~> 0.6)
+      responders (~> 0.9)
     journey (1.0.4)
     jquery-fileupload-rails (0.4.1)
       actionpack (>= 3.1)
@@ -90,19 +90,16 @@ GEM
     jquery-rails (2.2.1)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.7.5)
-    launchy (2.1.2)
+    json (1.7.7)
+    launchy (2.2.0)
       addressable (~> 2.3)
-    libwebsocket (0.1.7.1)
-      addressable
-      websocket
-    mail (2.4.4)
+    mail (2.5.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.5.0)
-    nokogiri (1.5.6)
+    mime-types (1.21)
+    multi_json (1.7.2)
+    nokogiri (1.5.9)
     paperclip (3.4.1)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
@@ -110,50 +107,50 @@ GEM
       cocaine (~> 0.5.0)
       mime-types
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.9)
-      actionmailer (= 3.2.9)
-      actionpack (= 3.2.9)
-      activerecord (= 3.2.9)
-      activeresource (= 3.2.9)
-      activesupport (= 3.2.9)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
       bundler (~> 1.0)
-      railties (= 3.2.9)
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
-    rdoc (3.12)
+    rake (10.0.4)
+    rdoc (3.12.2)
       json (~> 1.4)
     responders (0.9.3)
       railties (~> 3.1)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
-    rspec-rails (2.12.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+    rspec-rails (2.13.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
     rubyzip (0.9.9)
-    selenium-webdriver (2.27.2)
+    selenium-webdriver (2.31.0)
       childprocess (>= 0.2.5)
-      libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
+      websocket (~> 1.0.4)
     simple_form (2.1.0)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
@@ -162,18 +159,18 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
+    sqlite3 (1.3.7)
     strong_parameters (0.2.0)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
       railties (~> 3.0)
-    thor (0.16.0)
-    tilt (1.3.3)
+    thor (0.18.0)
+    tilt (1.3.6)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
-    websocket (1.0.6)
+    websocket (1.0.7)
     will_paginate (3.0.4)
     xpath (1.0.0)
       nokogiri (~> 1.3)

data/README.md

@@ -0,0 +1,10 @@
+Installation
+------------
+
+Need more than a single file attachment for a model?
+
+```ruby
+class Blog < ActiveRecord::Base
+  has_attached_files test: "200x200"
+end
+```

data/app/controllers/brightcontent/attachments_controller.rb

@@ -9,7 +9,7 @@ module Brightcontent
     end
 
     def create
-      @attachment = Attachment.new(params.slice(:attachable_id, :attachable_type, :asset))
+      @attachment = Attachment.new(attachment_params)
       if @attachment.save
         render json: @attachment.to_json, status: :created
       else
@@ -22,5 +22,11 @@ module Brightcontent
       redirect_to attachment.attachable
     end
 
+    private
+
+    def attachment_params
+      params.permit(:attachable_id, :attachable_type, :asset)
+    end
+
   end
 end

data/app/models/brightcontent/attachment.rb

@@ -21,8 +21,8 @@ module Brightcontent
     private
 
     def user_defined_styles
-      if attachable && attachable.respond_to?(:attachment_styles) && image?
-        attachable.attachment_styles
+      if attachable && attachable.class.attachment_styles && image?
+        attachable.class.attachment_styles
       end || {}
     end
 

data/lib/brightcontent/attachment_model_extensions.rb

@@ -0,0 +1,13 @@
+module Brightcontent
+  module AttachmentModelExtensions
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      attr_reader :attachment_styles
+      def has_attached_files(styles)
+        include Brightcontent::Attachable
+        @attachment_styles = styles
+      end
+    end
+  end
+end

data/lib/brightcontent/attachments.rb

@@ -6,6 +6,7 @@ require "brightcontent/attachments/engine"
 
 module Brightcontent
   autoload :Attachable, 'brightcontent/attachable'
+  autoload :AttachmentModelExtensions, 'brightcontent/attachment_model_extensions'
 
   module Attachments
   end

data/lib/brightcontent/attachments/engine.rb

@@ -1,6 +1,11 @@
 module Brightcontent
   module Attachments
     class Engine < ::Rails::Engine
+      initializer "Add attachments class method" do
+        ActiveSupport.on_load(:active_record) do
+          include AttachmentModelExtensions
+        end
+      end
     end
   end
 end

data/spec/dummy/app/models/blog.rb

@@ -1,7 +1,3 @@
 class Blog < ActiveRecord::Base
-  include Brightcontent::Attachable
-
-  def attachment_styles
-    { test: "200x200" }
-  end
+  has_attached_files test: "200x200"
 end

data/spec/models/brightcontent/attachment_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Brightcontent
   describe Attachment do
-    subject(:attachment) { Attachment.new }
+    subject(:attachment) { Attachment.new(asset_content_type: 'image/jpg') }
 
     describe ".attachment_styles" do
       context "without extra options" do
@@ -12,7 +12,7 @@ module Brightcontent
         let(:blog) { build_stubbed(:blog) }
         before { attachment.attachable = blog }
 
-        # its(:attachment_styles) { should == { test: "200x200", brightcontent: "100x100#", main: "200x200#" } }
+        its(:attachment_styles) { should == { test: "200x200", brightcontent: "100x100#", main: "200x200#" } }
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brightcontent-attachments
 version: !ruby/object:Gem::Version
-  version: 2.0.29
+  version: 2.0.30
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.29
+        version: 2.0.30
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.29
+        version: 2.0.30
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +148,7 @@ files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
+- README.md
 - Rakefile
 - app/assets/javascripts/brightcontent/.gitkeep
 - app/assets/javascripts/brightcontent/attachments.js
@@ -162,6 +163,7 @@ files:
 - db/migrate/20121222172513_create_attachments.rb
 - lib/brightcontent-attachments.rb
 - lib/brightcontent/attachable.rb
+- lib/brightcontent/attachment_model_extensions.rb
 - lib/brightcontent/attachments.rb
 - lib/brightcontent/attachments/engine.rb
 - lib/generators/brightcontent/attachments/install_generator.rb
@@ -238,7 +240,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 47621681418196684
+      hash: 3038259697186777372
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -247,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 47621681418196684
+      hash: 3038259697186777372
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24