has_filepicker_image 0.1.0 → 0.1.1

data/.gitignore

@@ -1,4 +1,5 @@
 pkg/*
+Gemfile.lock
 *.gem
 .bundle
 nbproject/*

data/.travis.yml

@@ -2,3 +2,6 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+env:
+- RAILS_VERSION=3.2
+- RAILS_VERSION=4.0

data/has_filepicker_image.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_dependency "rails", "~> #{ENV["RAILS_VERSION"] || "3.2"}"
+  s.add_dependency "railties"
+
   s.add_development_dependency "rspec-rails"
+  s.add_development_dependency "rspec-html-matchers"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "coveralls"
-
-  s.add_dependency "railties", ">= 3.1.0", "< 5.0"
-  s.add_dependency "rails", '>=3.2.0'
-
 end

data/lib/has_filepicker_image/helpers/form_builder_helper.rb

@@ -58,12 +58,24 @@ module HasFilepickerImage
         :class => 'filepicker-button'
       )
 
-      buttons + preview + ActionView::Helpers::InstanceTag.new(
-        @object_name,
-        attribute_name,
-        @template,
-        object
-      ).to_input_field_tag('hidden')
+      hidden_field =  if Rails::VERSION::MAJOR >= 4
+                        ActionView::Helpers::Tags::HiddenField.new(
+                          @object_name,
+                          attribute_name,
+                          @template,
+                          :object => object
+                        ).render
+                      else
+                        ActionView::Helpers::InstanceTag.new(
+                          @object_name,
+                          attribute_name,
+                          @template,
+                          object
+                        ).to_input_field_tag('hidden')
+                      end
+
+      buttons + preview + hidden_field
     end
+
   end
 end

data/lib/has_filepicker_image/version.rb

@@ -1,3 +1,3 @@
 module HasFilepickerImage
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/form_builder_spec.rb

@@ -17,77 +17,116 @@ describe HasFilepickerImage::FormBuilderHelper do
     end
 
     let(:model)   { TestModel.new }
-    let(:builder) { FormBuilder.new(:test_model, model, ActionView::Base.new, {}, proc {}) }
-
-    it "should add a filepicker_image_field method" do
-      builder.should respond_to(:filepicker_image_field)
+    let(:builder) do
+      args = [:test_model, model, ActionView::Base.new, {}]
+      args << proc {} if Rails::VERSION::MAJOR < 4
+      FormBuilder.new(*args)
     end
 
-    it "returns the filepicker input field" do
-      builder.filepicker_image_field(:image_url).should ==
-      "<div class=\"filepicker-button\">" +
-        "<a data-action=\"pickImage\" href=\"#\" style=\"\">Pick</a>" +
-        "<a href=\"#\" data-action=\"removeImage\" style=\"display:none;\">Remove</a>" +
-      "</div>" +
-      "<div class=\"filepicker-image\" style=\"display:none;\"></div>" +
-      "<input id=\"test_model_image_url\" name=\"test_model[image_url]\" type=\"hidden\" />"
-    end
+    let(:rendered) { builder.filepicker_image_field(:image_url) }
 
-    it "returns the filepicker input with preview" do
-      model.image_url = 'http://filepicker.io/images/1'
-      builder.filepicker_image_field(:image_url).should ==
-      "<div class=\"filepicker-button\">" +
-        "<a data-action=\"pickImage\" href=\"#\" style=\"display:none;\">Pick</a>" +
-        "<a href=\"#\" data-action=\"removeImage\" style=\"\">Remove</a>" +
-      "</div>" +
-      "<div class=\"filepicker-image\" style=\"\"><img alt=\"image_url thumbnail\" src=\"http://filepicker.io/images/1/convert?w=260&amp;h=180\" /></div>" +
-      "<input id=\"test_model_image_url\" name=\"test_model[image_url]\" type=\"hidden\" value=\"http://filepicker.io/images/1\" />"
+    it "displays the buttons" do
+      rendered.should have_tag 'div', :with => { :class => 'filepicker-button' } do
+        with_tag "a", :text => "Pick"
+        with_tag "a", :text => "Remove"
+      end
     end
 
-    it "returns the filepicker input with defaults options" do
-      @configuration.defaults = @configuration.defaults.deep_merge(
-        :html_options => { :'data-fp-debug' => true }
-      )
+    it "displays the image div" do
+      rendered.should have_tag "div", :with => { :class => 'filepicker-image' }
+    end
 
-      builder.filepicker_image_field(:image_url).should ==
-      "<div class=\"filepicker-button\">" +
-        "<a data-action=\"pickImage\" data-fp-debug=\"true\" href=\"#\" style=\"\">Pick</a>" +
-        "<a href=\"#\" data-action=\"removeImage\" style=\"display:none;\">Remove</a>" +
-      "</div>" +
-      "<div class=\"filepicker-image\" style=\"display:none;\"></div>" +
-      "<input id=\"test_model_image_url\" name=\"test_model[image_url]\" type=\"hidden\" />"
+    it "displays the hidden input" do
+      rendered.should have_tag "input", :with => {
+        :id => "test_model_image_url",
+        :name => "test_model[image_url]",
+        :type => "hidden"
+      }
     end
 
-    it "returns the filepicker input with custom options" do
+    it "displays customized buttons text" do
       @configuration.defaults = {
         :pick_button_html => 'Add Photo',
         :delete_button_html => 'Remove Photo'
       }
 
-      builder.filepicker_image_field(:image_url).should ==
-      "<div class=\"filepicker-button\">" +
-        "<a data-action=\"pickImage\" href=\"#\" style=\"\">Add Photo</a>" +
-        "<a href=\"#\" data-action=\"removeImage\" style=\"display:none;\">Remove Photo</a>" +
-      "</div>" +
-      "<div class=\"filepicker-image\" style=\"display:none;\"></div>" +
-      "<input id=\"test_model_image_url\" name=\"test_model[image_url]\" type=\"hidden\" />"
+      rendered.should have_tag 'div' do
+        with_tag "a", :text => "Add Photo"
+        with_tag "a", :text => "Remove Photo"
+      end
     end
 
+    it "displays the filepicker input with custom defaults options" do
+      @configuration.defaults = @configuration.defaults.deep_merge(
+        :html_options => { :'data-fp-debug' => true }
+      )
 
-    it "returns input with a different config" do
+      rendered.should have_tag 'div' do
+        with_tag "a", :with => { :'data-fp-debug' => "true" }
+      end
+    end
+
+    it "displays options from a custom config" do
       @configuration.add_config(
         :picture_config,
         :pick_button_html => 'Add Picture',
         :delete_button_html => 'Remove Picture'
       )
+      rendered = builder.filepicker_image_field(:image_url, :picture_config)
+      rendered.should have_tag 'div' do
+        with_tag "a", :text => "Add Picture"
+        with_tag "a", :text => "Remove Picture"
+      end
+    end
+
+    context "when empty value" do
+      it "displays buttons showing the pick one" do
+        rendered.should have_tag 'div', :with => { :class => 'filepicker-button' } do
+          with_tag "a", :text => "Pick", :with => { :'data-action' => "pickImage", :style => "" }
+          with_tag "a", :text => "Remove", :with => { :'data-action' => "removeImage", :style => "display:none;" }
+        end
+      end
+
+      it "does NOT display image previews" do
+        rendered.should have_tag "div", :with => { :class => 'filepicker-image', :style => 'display:none;' } do
+          without_tag "img"
+        end
+      end
+
+      it "displays the hidden input" do
+        rendered.should have_tag "input", :with => {
+          :id => "test_model_image_url",
+          :name => "test_model[image_url]",
+          :type => "hidden"
+        }
+      end
+    end
+
+
+    context "when value present" do
+      before { model.image_url = 'http://filepicker.io/images/1' }
+
+      it "displays the buttons showing the remove one" do
+        rendered.should have_tag 'div', :with => { :class => 'filepicker-button' } do
+          with_tag "a", :text => "Pick", :with => { :style => "display:none;" }
+          with_tag "a", :text => "Remove", :with => { :style => "" }
+        end
+      end
+
+      it "displays the image" do
+        rendered.should have_tag "div", :with => { :class => 'filepicker-image', :style => '' } do
+          with_tag "img", :alt => "image_url thumbnail", :src => "http://filepicker.io/images/1/convert?w=260&amp;h=180"
+        end
+      end
 
-      builder.filepicker_image_field(:image_url, :picture_config).should ==
-      "<div class=\"filepicker-button\">" +
-        "<a data-action=\"pickImage\" href=\"#\" style=\"\">Add Picture</a>" +
-        "<a href=\"#\" data-action=\"removeImage\" style=\"display:none;\">Remove Picture</a>" +
-      "</div>" +
-      "<div class=\"filepicker-image\" style=\"display:none;\"></div>" +
-      "<input id=\"test_model_image_url\" name=\"test_model[image_url]\" type=\"hidden\" />"
+      it "displays the hidden input with a value" do
+        rendered.should have_tag "input", :with => {
+          :id => "test_model_image_url",
+          :name => "test_model[image_url]",
+          :type => "hidden",
+          :value => "http://filepicker.io/images/1"
+        }
+      end
     end
 
   end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'rails/all'
 require 'rspec/rails'
+require 'rspec-html-matchers'
 require 'has_filepicker_image'
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_filepicker_image
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,17 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -28,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rspec-html-matchers
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,43 +76,37 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
 description: Easily add filepicker images to your models
 email:
 - polmiro@gmail.com
@@ -107,7 +117,6 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -137,12 +146,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3317842162528816829
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3317842162528816829
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/Gemfile.lock

@@ -1,124 +0,0 @@
-PATH
-  remote: .
-  specs:
-    has_filepicker_image (0.1.0)
-      rails (>= 3.2.0)
-      railties (>= 3.1.0, < 5.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.2.11)
-      actionpack (= 3.2.11)
-      mail (~> 2.4.4)
-    actionpack (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.11)
-      activesupport (= 3.2.11)
-      builder (~> 3.0.0)
-    activerecord (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-    activesupport (3.2.11)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.4)
-    coveralls (0.7.0)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    hike (1.2.1)
-    i18n (0.6.1)
-    journey (1.0.4)
-    json (1.7.6)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.25)
-    multi_json (1.5.0)
-    polyglot (0.3.3)
-    rack (1.4.4)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.11)
-      actionmailer (= 3.2.11)
-      actionpack (= 3.2.11)
-      activerecord (= 3.2.11)
-      activeresource (= 3.2.11)
-      activesupport (= 3.2.11)
-      bundler (~> 1.0)
-      railties (= 3.2.11)
-    railties (3.2.11)
-      actionpack (= 3.2.11)
-      activesupport (= 3.2.11)
-      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.1)
-      json (~> 1.4)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    rspec-rails (2.12.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
-    term-ansicolor (1.2.2)
-      tins (~> 0.8)
-    thor (0.17.0)
-    tilt (1.3.3)
-    tins (0.12.0)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.38)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  coveralls
-  has_filepicker_image!
-  rspec-rails
-  sqlite3