has_filepicker_image 0.1.1 → 0.1.2

data/README.md

@@ -1,9 +1,13 @@
-# HasFilepickerImage [![Build Status](https://travis-ci.org/polmiro/has_filepicker_image.png)](https://travis-ci.org/polmiro/has_filepicker_image) [![Code Climate](https://codeclimate.com/github/polmiro/has_filepicker_image.png)](https://codeclimate.com/github/polmiro/has_filepicker_image) [![Coverage Status](https://coveralls.io/repos/polmiro/has_filepicker_image/badge.png)](https://coveralls.io/r/polmiro/has_filepicker_image)
+# HasFilepickerImage
+
+[![Build Status](https://travis-ci.org/polmiro/has_filepicker_image.png)](https://travis-ci.org/polmiro/has_filepicker_image)
+[![Code Climate](https://codeclimate.com/github/polmiro/has_filepicker_image.png)](https://codeclimate.com/github/polmiro/has_filepicker_image)
+[![Coverage Status](https://coveralls.io/repos/polmiro/has_filepicker_image/badge.png)](https://coveralls.io/r/polmiro/has_filepicker_image)
+[![Gem Version](https://badge.fury.io/rb/has_filepicker_image.png)](http://badge.fury.io/rb/has_filepicker_image)
 
 This gem is mainly an extension of [filepicker-rails](https://github.com/Filepicker/filepicker-rails). It integrates url methods into the models and the form builders.
-This gem helps you get running with [filepicker.io](http://filepicker.io) in Rails with your ActiveRecord models.
-It provides methods for your models to easily retrieve sizes and styles of your images.
-It also adds form helpers to nicely display and reload your images in you forms
+This gem helps you get running with [filepicker.io](http://filepicker.io) in Rails with your ActiveRecord models. You will be able to easily define sizes and styles of your images.
+It also adds form helpers to seamelessly pick and preview the images in you forms.
 
 ## Installation
 
@@ -136,7 +140,7 @@ With Rails form builders
 <%= form_for @user do |f| %>
   <%= f.label :filepicker_url, "Upload Your Avatar:" %>
   <%= f.filepicker_image_field :filepicker_url, :delete_button_html => 'Esborrar' %>
-  <%= f.filepicker_field :filepicker_url, 'doc', :delete_button_html => 'Esborrar' %>
+  <%= f.filepicker_image_field :filepicker_url, 'doc', :delete_button_html => 'Esborrar' %>
   <%= f.submit %>
 <% end %>
 ```

data/has_filepicker_image.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
   s.homepage    = ""
   s.summary     = "Easily add filepicker images to your models"
   s.description = "Easily add filepicker images to your models"
+  s.license     = 'MIT'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/has_filepicker_image/base.rb

@@ -3,83 +3,19 @@ module HasFilepickerImage
     extend ActiveSupport::Concern
 
     module ClassMethods
-
       def has_filepicker_image(name, options = {})
         cattr_accessor :has_filepicker_image_styles
         self.has_filepicker_image_styles ||= {}
         self.has_filepicker_image_styles.merge!(name.to_sym => options[:styles])
 
         define_method name do |*args|
-          HasFilepickerImageUrlService.new(
-            name:   name,
-            url:    read_attribute("#{name}_url"),
-            styles: self.class.has_filepicker_image_styles[name],
-            args:   args
+          UrlBuilder.new(
+            :url    => read_attribute("#{name}_url"),
+            :styles => self.class.has_filepicker_image_styles[name],
+            :args   => args
           ).url
         end
       end
-
-      class HasFilepickerImageUrlService
-        def initialize(params)
-          @name     = params[:name]
-          @base_url = params[:url]
-          @styles   = params[:styles]
-          @retrieval_options, @conversion_options = parse_options(*params[:args])
-        end
-
-        def url
-          replace_asset_host(@base_url) + query_component if @base_url.present?
-        end
-
-        private
-
-        def replace_asset_host(url)
-          asset_host = Rails.application.config.has_filepicker_image.asset_host
-          if asset_host
-            uri = URI(url)
-            uri.host = asset_host
-            uri.to_s
-          else
-            url
-          end
-        end
-
-        def parse_options(*args)
-          retrieval_options = HashWithIndifferentAccess.new(:cache => true, :dl => 'false')
-          conversion_options = HashWithIndifferentAccess.new
-
-          if args.size > 2
-            raise 'Wrong number of arguments' if args.size > 2
-          elsif args.size > 0
-            hash = {}
-            arg = args[0]
-            if arg.is_a?(Hash)
-              hash.merge!(arg)
-            else
-              hash.merge!(args[1]) if args[1]
-              hash[:w] = @styles[arg][0]
-              hash[:h] = @styles[arg][1]
-            end
-            hash.assert_valid_keys(:w, :h, :fit, :dl, :cache)
-            retrieval_options.merge!(hash.slice(:dl, :cache))
-            conversion_options.merge!(hash.slice(:w, :h, :fit))
-            conversion_options[:fit] ||= 'max' if conversion_options.present?
-          end
-
-          [retrieval_options, conversion_options]
-        end
-
-        def query_component
-          component =  @conversion_options.present? ? '/convert' : ''
-          component + '?' + all_options.map { |k,v| "#{k}=#{v}" }.join('&')
-        end
-
-        def all_options
-          @retrieval_options.merge(@conversion_options)
-        end
-
-      end
-
     end
 
   end

data/lib/has_filepicker_image/helpers/form_builder_helper.rb

@@ -5,76 +5,29 @@ module HasFilepickerImage
     end
 
     def filepicker_field(attribute_name, *args)
+      raise ArgumentError.new if args.size > 2
+
       config = Rails.application.config.has_filepicker_image
       config_name = nil
       opts = {}
 
-      case args.size
-      when 0
-      when 1
-        if args[0].is_a?(Hash)
+      case
+        when args.size == 1 && args[0].is_a?(Hash)
           opts = args[0]
-        else
+        when args.size == 1 && !args[0].is_a?(Hash)
           config_name = args[0]
-        end
-      when 2
-        config_name, opts = args
-      else
-        raise ArgumentError.new('Wrong number of arguments for filepicker_field')
-      end
-
-      value = object.send(attribute_name)
-      options = config.get_config(config_name).deep_merge(opts)
-      html_options = options[:html_options] || {}
-
-      preview = @template.content_tag(:div, :class => 'filepicker-image', :style => (value.present? ? '' : 'display:none;')) do
-        if value.present?
-          # Render preview + Delete link
-          thumb_url = value + "/convert?w=260&h=180"
-          thumb_alt = "#{attribute_name} thumbnail"
-          @template.image_tag(thumb_url, alt: thumb_alt )
-        end
+        when args.size == 2
+          config_name, opts = args
       end
 
-      pick_button = @template.content_tag(:a,
-        options[:pick_button_html],
-        html_options.merge(
-          :href  => '#',
-          :style => value.present? ? 'display:none;' : '',
-          :'data-action' => 'pickImage'
-        )
-      )
-
-      remove_button = @template.link_to(
-        options[:delete_button_html],
-        '#',
-        :style => value.present? ? '' : 'display:none;',
-        :'data-action' => 'removeImage'
-      )
-
-      buttons = @template.content_tag(
-        :div,
-        pick_button + remove_button,
-        :class => 'filepicker-button'
-      )
-
-      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
+      View.new(
+        @object_name,
+        attribute_name,
+        @template,
+        config.get_config(config_name)
+          .deep_merge(opts)
+          .merge(:object => object)
+      ).render
     end
 
   end

data/lib/has_filepicker_image/url_builder.rb

@@ -0,0 +1,74 @@
+module HasFilepickerImage
+  class UrlBuilder
+    def initialize(options)
+      @url        = options[:url]
+      @options    = ApiOptions.new(options[:styles], *options[:args])
+      @asset_host = Rails.application.config.has_filepicker_image.asset_host
+    end
+
+    def url
+      replace_asset_host(@url) + query_component if @url.present?
+    end
+
+    private
+
+    def replace_asset_host(url)
+      if @asset_host
+        uri = URI(url)
+        uri.host = @asset_host
+        uri.to_s
+      else
+        url
+      end
+    end
+
+    def query_component
+      component =  @options.with_conversion_options? ? '/convert' : ''
+      component + '?' + @options.sort.map { |k,v| "#{k}=#{v}" }.join('&')
+    end
+
+    class ApiOptions < HashWithIndifferentAccess
+      CONVERSION_OPTIONS = [:w, :h, :fit]
+      RETRIEVAL_OPTIONS  = [:dl, :cache]
+      DEFAULT_OPTIONS    = {:cache => true, :dl => 'false', :fit => 'max'}
+      ALL_OPTIONS = RETRIEVAL_OPTIONS + CONVERSION_OPTIONS
+
+      def initialize(styles, hash_or_style = {}, hash = {})
+        @styles = styles
+
+        options = if hash_or_style.is_a?(Hash)
+          hash_or_style.assert_valid_keys(*ALL_OPTIONS)
+          hash_or_style
+        else
+          hash.assert_valid_keys(*ALL_OPTIONS)
+          style_api_options(hash_or_style).merge(hash)
+        end
+
+        merge! options
+        merge! defaults.except *options.keys.map(&:to_sym)
+      end
+
+      def with_conversion_options?
+        (keys.map(&:to_sym) & CONVERSION_OPTIONS).present?
+      end
+
+      private
+
+      def defaults
+        if with_conversion_options?
+          DEFAULT_OPTIONS
+        else
+          DEFAULT_OPTIONS.slice(*RETRIEVAL_OPTIONS)
+        end
+      end
+
+      def style_api_options(style)
+        {
+          :w => @styles[style][0],
+          :h => @styles[style][1]
+        }
+      end
+    end
+
+  end
+end

data/lib/has_filepicker_image/version.rb

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

data/lib/has_filepicker_image/view.rb

@@ -0,0 +1,85 @@
+module HasFilepickerImage
+  class View
+    def initialize(object_name, attribute_name, template, options = {})
+      @object_name = object_name
+      @attribute_name = attribute_name
+      @template = template
+      @options = options
+    end
+
+    def render
+      buttons + preview + hidden_field
+    end
+
+    private
+
+    def buttons
+      @template.content_tag(
+        :div,
+        pick_button + remove_button,
+        :class => 'filepicker-button'
+      )
+    end
+
+    def preview
+      @template.content_tag(:div, :class => 'filepicker-image', :style => (value.present? ? '' : 'display:none;')) do
+        if value.present?
+          # Render preview + Delete link
+          thumb_url = value + "/convert?w=260&h=180"
+          thumb_alt = "#{@attribute_name} thumbnail"
+          @template.image_tag(thumb_url, alt: thumb_alt )
+        end
+      end
+    end
+
+    def 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
+    end
+
+    def pick_button
+      @template.content_tag(:a,
+        @options[:pick_button_html],
+        html_options.merge(
+          :href  => '#',
+          :style => value.present? ? 'display:none;' : '',
+          :'data-action' => 'pickImage'
+        )
+      )
+    end
+
+    def remove_button
+      @template.link_to(
+        @options[:delete_button_html],
+        '#',
+        :style => value.present? ? '' : 'display:none;',
+        :'data-action' => 'removeImage'
+      )
+    end
+
+    def value
+      object.send(@attribute_name)
+    end
+
+    def object
+      @options[:object]
+    end
+
+    def html_options
+      @options[:html_options] || {}
+    end
+  end
+end

data/lib/has_filepicker_image.rb

@@ -4,6 +4,8 @@ require 'active_record'
 module HasFilepickerImage
   require "has_filepicker_image/version"
   require "has_filepicker_image/configuration"
+  require "has_filepicker_image/url_builder"
+  require "has_filepicker_image/view"
   require "has_filepicker_image/base"
   require "has_filepicker_image/helpers/view_helper"
   require "has_filepicker_image/helpers/form_builder_helper"

data/spec/model_spec.rb

@@ -34,19 +34,19 @@ describe TestModel do
 
     context "when called with options" do
       it "returns the url with the options" do
-        model.image(w: 1, h: 2, dl: true).should == 'http://filepicker.io/image/convert?cache=true&dl=true&w=1&h=2&fit=max'
+        model.image(w: 1, h: 2, dl: true).should == 'http://filepicker.io/image/convert?cache=true&dl=true&fit=max&h=2&w=1'
       end
     end
 
     context "when called with a style" do
       it "returns the url with the dimensions of the style and fit max by default" do
-        model.image(:small).should == 'http://filepicker.io/image/convert?cache=true&dl=false&w=50&h=100&fit=max'
+        model.image(:small).should == 'http://filepicker.io/image/convert?cache=true&dl=false&fit=max&h=100&w=50'
       end
     end
 
     context "when called with a style and options" do
       it "returns the url with the dimensions of the style and the provided options" do
-        model.image(:small, fit: 'crop', cache: 'false').should == 'http://filepicker.io/image/convert?cache=false&dl=false&w=50&h=100&fit=crop'
+        model.image(:small, fit: 'crop', cache: 'false').should == 'http://filepicker.io/image/convert?cache=false&dl=false&fit=crop&h=100&w=50'
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_filepicker_image
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -129,13 +129,16 @@ files:
 - lib/has_filepicker_image/helpers/formtastic_form_input.rb
 - lib/has_filepicker_image/helpers/simple_form_input.rb
 - lib/has_filepicker_image/helpers/view_helper.rb
+- lib/has_filepicker_image/url_builder.rb
 - lib/has_filepicker_image/version.rb
+- lib/has_filepicker_image/view.rb
 - spec/form_builder_spec.rb
 - spec/model_spec.rb
 - spec/spec_helper.rb
 - vendor/assets/javascripts/filepicker_async.js.erb
 homepage: ''
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -146,18 +149,12 @@ 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