railstar 0.0.11 → 0.0.12

data/lib/railstar/search_base.rb

@@ -1,68 +1,116 @@
 # -*- coding: utf-8 -*-
+#検索ベースモデル
+# V2.0
+
+=begin
+使用例
+
+class Search::Profile
+  include Railstar::SearchBase
+end
+
+=end
+
+
 module Railstar
-  class SearchBase
-    attr_accessor :where, :values
+  module SearchBase
 
-    def initialize(hash)
-      self.where = []
-      self.values = {}
-      if hash
-        hash.each do |k,v|
-          send("#{k}=", v)
-        end
+    def self.included base
+      base.class_eval do
+        attr_accessor :where, :values
+        extend ClassMethods
+        include ActiveModel::Naming
+        include ActiveModel::Validations
+        include ActiveModel::Conversion
       end
     end
 
-    def to_params
-      ret = {}
-      TARGET_COLUMN.each do |c|
-        unless eval(c.to_s).blank?
-          ret[c] = eval(c.to_s)
+    module ClassMethods
+      #meta data setter
+      def column name, options={}
+        ActiveRecord::ConnectionAdapters::Column.new(name, options[:default], options[:type] || "string").tap do |col|
+          define_method("#{name}=") do |value|
+            instance_variable_set("@#{name}", col.type_cast(value))
+          end
+          define_method(name) do
+            unless instance_variable_defined?("@#{name}")
+              instance_variable_set("@#{name}", col.default)
+            end
+            instance_variable_get("@#{name}")
+          end
         end
       end
-      return ret
-    end
 
-    def to_str_params
-      ret = to_params.map do |k,v|
-        begin
-          "#{k}=#{CGI.escape(v)}"
-        rescue
+      def set_model klass
+        #TODO: klassが存在する（ActiveRecord::Baseの子供として）かどうかをチェックしたい。
+        # ActiveRecord::Base.connection.tablesをみて、テーブル名からクラスを探すチェックをいれる
+        raise ArgumentError.new('please set ActiveRecord classs') unless defined?(klass)
+        define_method(:target_model) do
+          klass
         end
       end
-      ret.join("&")
     end
 
-    def base
-      create_conditions #TODO: 毎回条件作成をしないようにしたい
-      target_model.where([self.where.join(" AND "), values])
+    #params(検索条件を渡す)
+    def initialize conditions={}
+      conditions.each_pair do | key, val |
+        writer_method = "#{key}="
+        self.send(writer_method, val) if self.respond_to?(writer_method)
+      end
+    end
+
+    def find(options={})
+      reset_conditions
+      create_conditions
+      if where.blank?
+        target_model.scoped
+      else
+        target_model.where([where.join(" and "), values])
+      end
+    end
+
+    def count(options={})
+      reset_conditions
+      create_conditions
+      target_model.count("#{target_model.table_name}.id", options.merge(
+                                                                        :conditions => where.blank? ? nil : [where.join(" and "), values]
+                                                                        ))
     end
 
     private
-    def like(method, options={})
-      value = eval(method.to_s)
-      unless value.blank?
-        column = options[:column] || method
-        self.where << "#{with_table_name(options[:table_name],column)} like :#{method}"
-        self.values[method] = "%#{value}%"
+
+    def abstract!
+      raise "this is abstract class"
+    end
+
+    def create_conditions
+      abstract!
+    end
+
+
+    def like _method, table_name, options={}
+      value = eval _method.to_s
+      if value.present?
+        self.where << "#{with_table_name(table_name, _method)} like :#{_method}"
+        self.values[_method] = "%#{value}%"
       end
     end
-    
-    def eq(method, options={})
-      compare(method, "=", options)
+
+    def eq _method, table_name, options={}
+      compare _method, "=", table_name, options
     end
-    
-    def inc(method, options={})
-      value = eval(method.to_s)
-      value = value.split(",") if value.is_a?(String) && value.include?(",")
-      unless value.blank?
-        column = options[:column] || method
-        self.where << "#{with_table_name(options[:table_name],column)} in (:#{method})"
-        self.values[method] = value
+
+    def inc _method, table_name, options={}
+      value = eval _method.to_s
+      value = value.splot(",") if value.is_a(String) && value.include?(",")
+      if value.present?
+        column = options[:column] || _method
+        self.where << "#{with_table_name(options[:table_name],column)} in (:#{_method})"
+        self.values[_method] = value
       end
     end
 
-    def compare(method, sign, options={})
+    def compare method, sign, table_name, options={}
       return unless sign =~ /^[<>=]{1,2}$/
       value = eval(method.to_s)
       unless value.blank?
@@ -72,7 +120,7 @@ module Railstar
       end
     end
 
-    def bit(method, options={})
+    def bit method, table_name, options={}
       value = eval(method.to_s)
       unless value.blank?
         column = options[:column] || method
@@ -81,12 +129,16 @@ module Railstar
       end
     end
 
-
     def with_table_name table_name, method
       ret = ""
       ret << "#{table_name || target_model.table_name}." if table_name
       ret << method.to_s
       ret
     end
+
+    def reset_conditions
+      self.where = []
+      self.values = {}
+    end
   end
 end

data/lib/railstar/version.rb

@@ -1,3 +1,3 @@
 module Railstar
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railstar
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-21 00:00:00.000000000Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70249127693780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70249127693780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70249127693360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70249127693360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: railstar
 email:
 - info@raw-hide.co.jp
@@ -254,7 +264,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4575289140214983714
+      hash: 1332917519886964449
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -263,10 +273,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4575289140214983714
+      hash: 1332917519886964449
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: RAWHIDE. Core Rails Lib