kashiwamochi 0.2.2 → 0.2.3

data/.gitignore

@@ -1,4 +1,19 @@
 *.gem
+*.rbc
 .bundle
+.config
+.yardoc
 Gemfile.lock
-pkg/*
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+vendor
+log

data/.travis.yml

@@ -1,4 +1,6 @@
+language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
-
+notifications:
+  irc: "irc.freenode.org#mashiro-dev"

data/lib/kashiwamochi.rb

@@ -1,9 +1,23 @@
-require 'active_support'
-require 'active_support/core_ext/hash'
 require "kashiwamochi/version"
-require 'kashiwamochi/configuration'
-require 'kashiwamochi/search'
-require 'kashiwamochi/sort'
-require 'kashiwamochi/query'
 require 'kashiwamochi/railtie' if defined?(Rails)
 
+module Kashiwamochi
+  autoload :Configuration, 'kashiwamochi/configuration'
+  autoload :Search,        'kashiwamochi/search'
+  autoload :Sort,          'kashiwamochi/sort'
+  autoload :Query,         'kashiwamochi/query'
+
+  class << self
+    def config
+      @config ||= Kashiwamochi::Configuration.new
+    end
+
+    def configure
+      yield config
+    end 
+
+    def build(attributes)
+      Query.new attributes
+    end
+  end
+end

data/lib/kashiwamochi/action_controller.rb

@@ -3,7 +3,7 @@ module Kashiwamochi
     extend ActiveSupport::Concern
 
     def build_search_query!
-      q = params.delete(Kashiwamochi.config.search_key)
+      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!)

data/lib/kashiwamochi/configuration.rb

@@ -1,12 +1,6 @@
-module Kashiwamochi
-  def self.config
-    @config ||= Kashiwamochi::Configuration.new
-  end
-
-  def self.configure
-    yield config
-  end 
+require 'active_support/configurable'
 
+module Kashiwamochi
   class Configuration
     include ActiveSupport::Configurable
     config_accessor :search_key

data/lib/kashiwamochi/query.rb

@@ -1,19 +1,15 @@
-require 'kashiwamochi/configuration'
-require 'kashiwamochi/search'
-require 'kashiwamochi/sort'
+require 'active_support/ordered_hash'
 
 module Kashiwamochi
-
   class Query
     attr_accessor :search_params, :sort_params
 
-    def initialize(attributes)
+    def initialize(attributes = {})
       @search_params = ActiveSupport::OrderedHash.new.with_indifferent_access
       @sort_params = ActiveSupport::OrderedHash.new.with_indifferent_access
 
       sort_key = Kashiwamochi.config.sort_key.to_s
 
-      attributes ||= {}
       attributes.each do |key, value|
         if key.to_s == sort_key
           add_sort_param(key, value)
@@ -47,6 +43,16 @@ module Kashiwamochi
       end
     end
 
+    def respond_to?(method_id, include_private = false)
+      super || respond_to_missing?(method_id, include_private)
+    end
+
+    def respond_to_missing?(method_id, include_private)
+      method_name = method_id.to_s
+      return true if method_name =~ /(.+)=$/
+      super
+    end 
+
     def method_missing(method_id, *args, &block)
       method_name = method_id.to_s
       if method_name =~ /(.+)=$/
@@ -79,9 +85,4 @@ module Kashiwamochi
       false
     end
   end
-
-  def self.build(attributes)
-    Query.new attributes
-  end
-
 end

data/lib/kashiwamochi/railtie.rb

@@ -1,5 +1,5 @@
-require 'kashiwamochi/action_controller'
 require 'kashiwamochi/action_view'
+require 'kashiwamochi/action_controller'
 
 module Kashiwamochi
   class Railtie < Rails::Railtie

data/lib/kashiwamochi/search.rb

@@ -1,5 +1,4 @@
 module Kashiwamochi
-
   class Search
     attr_reader :key, :value 
 
@@ -12,5 +11,4 @@ module Kashiwamochi
       "#<Search #{key}: #{value}>"
     end
   end
-
 end

data/lib/kashiwamochi/sort.rb

@@ -1,7 +1,4 @@
-require 'active_support/core_ext'
-
 module Kashiwamochi
-
   class Sort
     DIRS = {:asc => 'asc', :desc => 'desc'}.freeze
 
@@ -68,5 +65,4 @@ module Kashiwamochi
       new(key, dir)
     end
   end
-
 end

data/lib/kashiwamochi/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kashiwamochi
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-10 00:00:00.000000000Z
+date: 2012-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &16548820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *16548820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &16548300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *16548300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &16547920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16547920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &16547460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16547460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16547040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16547040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &16546620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +101,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16546620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Searching form and sorting query builder
 email:
 - mail@mashiro.org
@@ -101,7 +131,6 @@ files:
 - lib/kashiwamochi/search.rb
 - lib/kashiwamochi/sort.rb
 - lib/kashiwamochi/version.rb
-- log/development.log
 - spec/fake_app.rb
 - spec/helpers/action_view_spec.rb
 - spec/kashiwamochi/action_controller_spec.rb
@@ -121,15 +150,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 743234285744904988
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 743234285744904988
 requirements: []
 rubyforge_project: kashiwamochi
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Minimal searchng extension for Rails 3