sql_record 1.0.4 → 1.0.5

data/Gemfile

@@ -1,7 +1,7 @@
-source "http://rubygems.org"
+source :rubygems
 # Add dependencies required to use your gem here.
 # Example:
-#   gem "activesupport", ">= 2.3.5"
+gem "activerecord", ">= 2.3.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,8 +1,21 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.5)
+    arel (2.0.9)
+    builder (2.1.2)
     diff-lcs (1.1.2)
     git (1.2.5)
+    i18n (0.5.0)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
@@ -18,12 +31,14 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
+    tzinfo (0.3.25)
     yard (0.6.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord (>= 2.3.0)
   bundler (~> 1.0.0)
   jeweler (~> 1.5.2)
   rcov

data/README.rdoc

@@ -8,7 +8,7 @@ Well that's what SQLRecord does.
 
 == Example
 
-    class UserWithAccount << SQLRecord::Base
+    class UserWithAccount < SQLRecord::Base
 
       with_opts :class => User do
         column :id
@@ -22,9 +22,9 @@ Well that's what SQLRecord does.
 
       column :account_id, :from => :id, :class => Account
 
-      query do |params, default_columns|
+      query do |params|
         [
-          "SELECT #{default_columns} " +
+          "SELECT #{sql_select_columns.join(', ')} " +
           "FROM users INNER JOIN accounts " +
           "ON users.account_id = accounts.id " +
           "WHERE users.id = ?",

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/sql_record/attributes/mapper.rb

@@ -29,6 +29,12 @@ module SQLRecord
         @default_opts = nil
       end
 
+      # Sugar for with
+      def with_class klass, opts = {}, &block
+        opts[:class] = klass
+        with_opts opts, &block
+      end
+
       # Specifies the mapping from an ActiveRecord#column_definition to an SQLRecord instance attribute.
       # @param [Symbol] attribute_name the attribute you are defining for this model
       # @option opts [Class] :class the active record this attribute will use to type_cast from
@@ -59,10 +65,6 @@ module SQLRecord
         (@sql_select_columns ||= []) << select_column
       end
 
-      def sql_select_helper
-         @sql_select_columns.join(', ')
-      end
-
     end
   end
 end

data/lib/sql_record/sanitized_query.rb

@@ -11,6 +11,15 @@ module SQLRecord
       end
     end
 
+    # Specifies the query to execute
+    # @yield the block that will be executed with each {#find}
+    # @yieldparam [Hash] params the parametrs passed in from {#find}
+    # @yieldreturn [Array, String] Either the sql string or a sanitize array to be executed.
+    # @note
+    #   do not try to sanitize identifiers, only values will sanitize well
+    #     ["where id = ?", 1] => "where id = 1"
+    #     ["where name = ?", "hello"] => "where id = 'hello'"
+    #     ["ORDER BY ? ASC", "id"] => "ORDER BY 'id' ASC"  << not legitimate SQL
     def query &deferred
       @query_proc = deferred
     end
@@ -18,12 +27,18 @@ module SQLRecord
     protected
 
     # @todo check that this logs the sql
+    # @todo Write own sanitizer: (http://www.ruby-forum.com/topic/187658)
+    #   sanitize_sql_array sanitizes values correctly, not identifiers, eg:
+    #   ["where id = ?", 1] => "where id = 1"
+    #   ["where name = ?", "hello"] => "where id = 'hello'"
+    #   ["ORDER BY ? ASC", "id"] => "ORDER BY 'id' ASC"  << not legitimate SQL
     def execute_query params={}
-      sql = ActiveRecord::Base.send(:sanitize_sql_array, get_query_array(params))
+      sql = get_query(params)
+      sql = ActiveRecord::Base.send(:sanitize_sql_array, sql) if sql.is_a?(Array)
       ActiveRecord::Base.connection.execute(sql)
     end
 
-    def get_query_array(params)
+    def get_query(params)
         @query_proc.call(params)
     end
 

data/sql_record.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sql_record}
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rasheed Abdul-Aziz"]
-  s.date = %q{2011-04-08}
+  s.date = %q{2011-04-11}
   s.description = %q{Do you use ActiveRecord::Connection.execute for speed sometimes? Does it bother you that the results are not mapped to your schema and type-cast as ActiveRecord would? Well that's what SQLRecord does.}
   s.email = %q{rasheed@visfleet.com}
   s.extra_rdoc_files = [
@@ -52,6 +52,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activerecord>, [">= 2.3.0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
@@ -59,6 +60,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
+      s.add_dependency(%q<activerecord>, [">= 2.3.0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
@@ -67,6 +69,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
+    s.add_dependency(%q<activerecord>, [">= 2.3.0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sql_record
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Rasheed Abdul-Aziz
@@ -15,12 +15,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 +00:00
+date: 2011-04-11 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: activerecord
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
+        version: 2.3.0
+  prerelease: false
+  type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,10 +47,10 @@ dependencies:
         version: "0"
   prerelease: false
   type: :development
-  requirement: *id001
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -47,10 +63,10 @@ dependencies:
         version: 2.3.0
   prerelease: false
   type: :development
-  requirement: *id002
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   name: yard
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,10 +79,10 @@ dependencies:
         version: 0.6.0
   prerelease: false
   type: :development
-  requirement: *id003
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   name: bundler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,10 +95,10 @@ dependencies:
         version: 1.0.0
   prerelease: false
   type: :development
-  requirement: *id004
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -95,10 +111,10 @@ dependencies:
         version: 1.5.2
   prerelease: false
   type: :development
-  requirement: *id005
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   name: rcov
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -109,7 +125,7 @@ dependencies:
         version: "0"
   prerelease: false
   type: :development
-  requirement: *id006
+  requirement: *id007
 description: Do you use ActiveRecord::Connection.execute for speed sometimes? Does it bother you that the results are not mapped to your schema and type-cast as ActiveRecord would? Well that's what SQLRecord does.
 email: rasheed@visfleet.com
 executables: []