kashiwamochi 0.2.1 → 0.2.2

data/.travis.yml

@@ -1,3 +1,4 @@
 rvm:
-  - 1.9.2
-  - 1.9.3
+  - 1.9.2
+  - 1.9.3
+

data/README.md

@@ -55,15 +55,9 @@ end
 ### CSS
 
 ```css
-// Show the sort direction.
-.sort_link {
-    &.asc:after {
-      content: " \25b2";
-    }   
-    &.desc:after {
-      content: " \25bc";
-    }   
-}
+/* Show the sort direction. */
+.sort_link.asc:after  { content: " \25b2"; }   
+.sort_link.desc:after { content: " \25bc"; }   
 ```
 
 ## Copyright

data/kashiwamochi.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Kashiwamochi::VERSION
   s.authors     = ["mashiro"]
   s.email       = ["mail@mashiro.org"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/mashiro/kashiwamochi"
   s.summary     = %q{Minimal searchng extension for Rails 3}
   s.description = %q{Searching form and sorting query builder}
 
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency "railties", "~> 3.0"
   s.add_development_dependency "activerecord", "~> 3.0"
   s.add_development_dependency "sqlite3"
+  s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
   s.add_development_dependency "rspec-rails"
 end

data/lib/kashiwamochi/action_controller.rb

@@ -2,14 +2,10 @@ module Kashiwamochi
   module ActionController
     extend ActiveSupport::Concern
 
-    module InstanceMethods
-
-      def build_search_query!
-        q = params.delete(Kashiwamochi.config.search_key)
-        instance_variable_set("@#{Kashiwamochi.config.search_key}", Kashiwamochi.build(q))
-      end
-      alias_method :build_query!, :build_search_query! unless defined?(build_query!)
-
+    def build_search_query!
+      q = params.delete(Kashiwamochi.config.search_key)
+      instance_variable_set("@#{Kashiwamochi.config.search_key}", Kashiwamochi.build(q))
     end
+    alias_method :build_query!, :build_search_query! unless defined?(build_query!)
   end
 end

data/lib/kashiwamochi/action_view.rb

@@ -2,50 +2,46 @@ module Kashiwamochi
   module ActionView
     extend ActiveSupport::Concern
 
-    module InstanceMethods
-
-      def search_form_for(query, *args, &block)
-        options = args.extract_options!
-
-        options[:url] ||= url_for
-        options[:as] ||= Kashiwamochi.config.search_key
-        options[:method] ||= :get
-        options[:html] ||= {}
-        options[:html].tap do |html|
-          html[:id] ||= "#{options[:as]}_#{Kashiwamochi.config.form_class}"
-          html[:class] = [
-            html[:class] || "#{options[:as]}_#{Kashiwamochi.config.form_class}",
-            "#{Kashiwamochi.config.form_class}"
-          ].compact.join(' ')
-          html[:method] ||= :get
-        end
-
-        form_method = options.delete(:form_method) || Kashiwamochi.config.form_method
-        send(form_method, query, *(args << options), &block)
+    def search_form_for(query, *args, &block)
+      options = args.extract_options!
+
+      options[:url] ||= url_for
+      options[:as] ||= Kashiwamochi.config.search_key
+      options[:method] ||= :get
+      options[:html] ||= {}
+      options[:html].tap do |html|
+        html[:id] ||= "#{options[:as]}_#{Kashiwamochi.config.form_class}"
+        html[:class] = [
+          html[:class] || "#{options[:as]}_#{Kashiwamochi.config.form_class}",
+          "#{Kashiwamochi.config.form_class}"
+        ].compact.join(' ')
+        html[:method] ||= :get
       end
 
-      def search_sort_link_to(query, attribute, *args)
-        options = args.extract_options!
-        html_options = options.delete(:html_options) || {}
-        default_order = options.delete(:default_order)
+      form_method = options.delete(:form_method) || Kashiwamochi.config.form_method
+      send(form_method, query, *(args << options), &block)
+    end
 
-        attr_name = attribute.to_s
-        sort = query.sort_params[attr_name] || Kashiwamochi::Sort.new(attr_name, default_order)
+    def search_sort_link_to(query, attribute, *args)
+      options = args.extract_options!
+      html_options = options.delete(:html_options) || {}
+      default_order = options.delete(:default_order)
 
-        html_options[:class] = [
-          html_options[:class] || "#{attr_name}_#{Kashiwamochi.config.sort_link_class}",
-          Kashiwamochi.config.sort_link_class,
-          sort.dir.downcase
-        ].compact.join(' ')
+      attr_name = attribute.to_s
+      sort = query.sort_params[attr_name] || Kashiwamochi::Sort.new(attr_name, default_order)
 
-        query.sort_params[attr_name] = sort.toggle!
-        options[Kashiwamochi.config.search_key] = query.to_option
+      html_options[:class] = [
+        html_options[:class] || "#{attr_name}_#{Kashiwamochi.config.sort_link_class}",
+        Kashiwamochi.config.sort_link_class,
+        sort.dir.downcase
+      ].compact.join(' ')
 
-        name = args.shift || attr_name
-        link_to(name, options, html_options)
-      end
-      alias_method :sort_link_to, :search_sort_link_to unless defined?(sort_link_to)
+      query.sort_params[attr_name] = sort.toggle!
+      options[Kashiwamochi.config.search_key] = query.to_option
 
+      name = args.shift || attr_name
+      link_to(name, options, html_options)
     end
+    alias_method :sort_link_to, :search_sort_link_to unless defined?(sort_link_to)
   end
 end

data/lib/kashiwamochi/version.rb

@@ -1,3 +1,3 @@
 module Kashiwamochi
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kashiwamochi
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-20 00:00:00.000000000Z
+date: 2012-01-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &15206940 !ruby/object:Gem::Requirement
+  requirement: &16548820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *15206940
+  version_requirements: *16548820
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &15206400 !ruby/object:Gem::Requirement
+  requirement: &16548300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *15206400
+  version_requirements: *16548300
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &15205920 !ruby/object:Gem::Requirement
+  requirement: &16547920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15205920
+  version_requirements: *16547920
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &16547460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *16547460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15205300 !ruby/object:Gem::Requirement
+  requirement: &16547040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15205300
+  version_requirements: *16547040
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &15204720 !ruby/object:Gem::Requirement
+  requirement: &16546620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15204720
+  version_requirements: *16546620
 description: Searching form and sorting query builder
 email:
 - mail@mashiro.org
@@ -98,7 +109,7 @@ files:
 - spec/kashiwamochi/query_spec.rb
 - spec/kashiwamochi/sort_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/mashiro/kashiwamochi
 licenses: []
 post_install_message: 
 rdoc_options: []