bigrecord 0.0.10 → 0.0.11

data/README.rdoc

@@ -48,5 +48,6 @@ Big Record is released under the MIT license.
 == Links
 
 * Contact Us
+  * Google Group - http://groups.google.com/group/bigrecord
   * Website - http://www.bigrecord.org
   * IRC Channel - <tt>#bigrecord</tt> on irc.freenode.net

data/Rakefile

@@ -1,16 +1,9 @@
-#!/usr/bin/env ruby
-
 require 'rubygems'
-require 'rake'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
-require 'spec/rake/spectask'
-
 
-DATA_STORES = ["hbase", "cassandra"]
+DATA_STORES = ["hbase"]
 ROOT = File.expand_path(File.dirname(__FILE__)) + '/'
 
-require ROOT + 'tasks/gem'
-require ROOT + 'tasks/rdoc'
-require ROOT + 'tasks/spec'
-require ROOT + 'tasks/data_store'
+load 'tasks/data_store.rake'
+load 'tasks/gem.rake'
+load 'tasks/rdoc.rake'
+load 'tasks/spec.rake'

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/lib/big_record/abstract_base.rb

@@ -172,7 +172,7 @@ module BigRecord
 
       attributes.each do |k, v|
         begin
-          k.include?("(") ? multi_parameter_attributes << [ k, v ] : send(k + "=", v)
+          k.include?("(") ? multi_parameter_attributes << [ k, v ] : send(k + "=", v) if v
         rescue
           logger.debug "#{__FILE__}:#{__LINE__} Warning! Ignoring attribute '#{k}' because it doesn't exist anymore"
         end
@@ -891,6 +891,7 @@ private
       # @return [ConnectionAdapters::Column] The column object created.
       def column(name, type, options={})
         name = name.to_s
+        name = "#{self.default_column_prefix}#{name}" unless (name =~ /:/) || self.default_column_prefix.blank?
 
         @columns_hash = default_columns unless @columns_hash
 
@@ -1045,6 +1046,11 @@ private
        read_inheritable_attribute(:attr_create_accessible)
       end
 
+      # Default column prefix used when auto-generating column attribute names
+      def default_column_prefix
+        ""
+      end
+
     protected
       def invalidate_views
         @views = nil

data/lib/big_record/ar_associations/association_proxy.rb

@@ -5,7 +5,7 @@ module BigRecord
       alias_method :proxy_respond_to?, :respond_to?
       alias_method :proxy_extend, :extend
       delegate :to_param, :to => :proxy_target
-      instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|proxy_)/ }
+      instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|proxy_|object_id)/ }
 
       def initialize(owner, reflection)
         @owner, @reflection = owner, reflection

data/lib/big_record/base.rb

@@ -399,7 +399,7 @@ module BigRecord
       #
       # Defaults to "attribute"
       def default_family
-        (superclass == BigRecord::Base) ? (@default_family ||= "attribute") : superclass.default_family
+        @default_family ||= "attribute"
       end
 
       # Set the default column family used to store attributes that have no column family set explicitly.
@@ -466,12 +466,8 @@ module BigRecord
         {primary_key => ConnectionAdapters::Column.new(primary_key, 'string')}
       end
 
-      # @see BigRecord::AbstractBase.column
-      def column(name, type, options={})
-        name = name.to_s
-        name = "#{self.default_family}:#{name}" unless (name =~ /:/)
-
-        super(name, type, options)
+      def default_column_prefix
+        "#{default_family}:"
       end
 
       # Return the hash of default views which consist of all columns and the :default named views.

data/lib/big_record/br_associations/association_proxy.rb

@@ -5,7 +5,7 @@ module BigRecord
       alias_method :proxy_respond_to?, :respond_to?
       alias_method :proxy_extend, :extend
       delegate :to_param, :to => :proxy_target
-      instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|proxy_)/ }
+      instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|proxy_|object_id)/ }
 
       def initialize(owner, reflection)
         @owner, @reflection = owner, reflection

data/lib/big_record/br_associations/has_and_belongs_to_many_association.rb

@@ -42,9 +42,10 @@ module BigRecord
           # Generate the sql query. The join table has to be in mysql.
           conditions = "#{@finder_sql}"
 
-          if sanitized_conditions = ActiveRecord::Base.send(:sanitize_sql, options[:conditions])
-            conditions << " AND (#{sanitized_conditions})"
-          end
+          # FIXME: throws "undefined method `abstract_class?' for Object:Class"
+#          if sanitized_conditions = ActiveRecord::Base.send(:sanitize_sql, options[:conditions])
+#            conditions << " AND (#{sanitized_conditions})"
+#          end
 
           if options[:order] && @reflection.options[:order]
             order = "#{options[:order]}, #{@reflection.options[:order]}"

data/lib/big_record/br_reflection.rb

@@ -60,9 +60,9 @@ module BigRecord
           when macro == :belongs_to_big_record
             @primary_key_name = options[:foreign_key] || class_name.foreign_key
           when macro == :belongs_to_many
-            @primary_key_name = options[:foreign_key] || "#{big_record.default_family}:#{class_name.tableize}_ids"
+            @primary_key_name = options[:foreign_key] || "#{big_record.default_column_prefix}#{class_name.tableize}_ids"
           when options[:as]
-            @primary_key_name = options[:foreign_key] || "#{big_record.default_family}:#{options[:as]}_id"
+            @primary_key_name = options[:foreign_key] || "#{big_record.default_column_prefix}#{options[:as]}_id"
           else
             @primary_key_name = options[:foreign_key] || big_record.name.foreign_key
         end

data/lib/big_record/connection_adapters/column.rb

@@ -306,7 +306,8 @@ module BigRecord
             when String then value.split(COLLECTION_SEPARATOR)
             when Hash then value.values.first.scan(/\[(.*?)\]/).flatten
             when NilClass then []
-            else value
+            when Array then value
+            else [value]
           end
         end
 
@@ -316,7 +317,16 @@ module BigRecord
         end
 
         def hash_to_integer_collection(value)
-          parse_collection(value).collect(&:to_i)
+          ret = nil
+          begin
+            collection = parse_collection(value)
+            ret = collection.collect(&:to_i)
+          rescue
+            $stderr.puts("expected an array, got #{collection}, (#{collection.class})\n"+
+              "original value fed into parse_collection was #{value}, (#{value.class})")
+            ret = [collection.to_i]
+          end
+          ret
         end
 
         def hash_to_float_collection(value)
@@ -354,6 +364,9 @@ module BigRecord
         end
 
         def string_to_date(string)
+          # Important: the stored value could be an instance of Time.  If we don't
+          #   cast to Date, the cast will fail because column type != value type
+          return new_date(string.year, string.month, string.day) if (string.is_a?Time)
           return string unless string.is_a?(String)
           return nil if string.empty?
 

data/lib/big_record/connection_adapters/hbase_adapter.rb

@@ -1,25 +1,15 @@
-require 'rubygems'
 require 'set'
 require 'drb'
 
 module BigRecord
   class Base
     # Establishes a connection to the database that's used by all Active Record objects.
-    def self.hbase_connection(config) # :nodoc:
-      unless defined?(BigRecordDriver)
-        begin
-          # Bigrecord's source is included with Bigrecord-Driver, that's where we check for it first.
-          require File.join(File.dirname(__FILE__), "..", "..", "..", "..", "bigrecord-driver", "lib", "big_record_driver")
-        rescue LoadError
-          # Then we'll require it from the load path (or rubygems)
-          begin
-            require 'bigrecord_driver'
-          rescue LoadError => e
-            # If it couldn't be found, we'll just prompt the user to install the gem.
-            puts "[BigRecord] bigrecord-driver is needed for HbaseAdapter. Install it with: gem install bigrecord-driver"
-            raise e
-          end
-        end
+    def self.hbase_connection(config)
+      begin
+        require 'big_record_driver'
+      rescue LoadError => e
+        puts "[BigRecord] bigrecord-driver is needed for HbaseAdapter. Install it with: gem install bigrecord-driver"
+        raise e
       end
 
       config = config.symbolize_keys
@@ -29,7 +19,7 @@ module BigRecord
       drb_host                = config[:drb_host]
       drb_port                = config[:drb_port]
 
-      hbase = BigRecordDriver::Client.new(config)
+      hbase = BigRecord::Driver::Client.new(config)
 
       ConnectionAdapters::HbaseAdapter.new(hbase, logger, [zookeeper_host, zookeeper_client_port], config)
     end
@@ -88,7 +78,7 @@ module BigRecord
 
       def active?
         @connection.ping
-      rescue BigRecordError
+      rescue BigRecord::Driver::DriverError
         false
       end
 
@@ -259,7 +249,7 @@ module BigRecord
       end
 
       def add_column_family(table_name, column_name, options = {})
-        column = BigRecordDriver::ColumnDescriptor.new(column_name.to_s, options)
+        column = BigRecord::Driver::ColumnDescriptor.new(column_name.to_s, options)
 
         result = nil
         log "ADD COLUMN TABLE #{table_name} COLUMN #{column_name} (#{options.inspect});" do
@@ -281,7 +271,7 @@ module BigRecord
       alias :remove_family :remove_column_family
 
       def modify_column_family(table_name, column_name, options = {})
-        column = BigRecordDriver::ColumnDescriptor.new(column_name.to_s, options)
+        column = BigRecord::Driver::ColumnDescriptor.new(column_name.to_s, options)
 
         result = nil
         log "MODIFY COLUMN TABLE #{table_name} COLUMN #{column_name} (#{options.inspect});" do
@@ -332,7 +322,7 @@ module BigRecord
         when TYPE_NULL then nil
         when TYPE_STRING then data[1..-1]
         when TYPE_BINARY then data[1..-1]
-        else nil
+        else data
         end
       end
 
@@ -412,7 +402,7 @@ module BigRecord
       end
 
       def column_family(name, options = {})
-        column = self[name] || BigRecordDriver::ColumnDescriptor.new(name.to_s, options)
+        column = self[name] || BigRecord::Driver::ColumnDescriptor.new(name.to_s, options)
 
         @column_families << column unless @column_families.include? column
         self

data/lib/big_record/connection_adapters/hbase_rest_adapter.rb

@@ -5,16 +5,16 @@ module BigRecord
     # Establishes a connection to the database that's used by all Active Record objects.
     def self.hbase_rest_connection(config) # :nodoc:
       begin
-        require 'hbase'
+        require 'stargate'
       rescue LoadError => e
-        puts "[BigRecord] hbase-ruby is needed for HbaseRestAdapter. Install it with: gem install hbase-ruby"
+        puts "[BigRecord] hbase-stargate is needed for HbaseRestAdapter. Install it with: gem install hbase-stargate"
         raise e
       end
 
       config = config.symbolize_keys
 
       api_address = config[:api_address]
-      hbase = HBase::Client.new(api_address)
+      hbase = Stargate::Client.new(api_address)
       ConnectionAdapters::HbaseRestAdapter.new(hbase, logger, [], config)
     end
   end
@@ -163,7 +163,7 @@ module BigRecord
       def get_consecutive_rows_raw(table_name, start_row, limit, columns, stop_row = nil)
         result = nil
         log "SCAN (#{columns.join(", ")}) FROM #{table_name} WHERE START_ROW=#{start_row} AND STOP_ROW=#{stop_row} LIMIT=#{limit};" do
-          options = {:start_row => start_row, :end_row => stop_row, :columns => columns}
+          options = {:start_row => start_row, :end_row => stop_row, :columns => columns, :batch => 200}
           scanner = @connection.open_scanner(table_name, options)
           result = @connection.get_rows(scanner, limit)
           @connection.close_scanner(scanner)

data/lib/big_record/dynamic_schema.rb

@@ -21,7 +21,7 @@ module BigRecord
 
     # Add an existing dynamic column to this record
     def add_dynamic_column(col)
-      columns_hash[c.name] = col
+      columns_hash[col.name] = col
       @columns_name= nil; @columns= nil #reset
       col
     end

data/lib/big_record/embedded_associations/association_proxy.rb

@@ -1,7 +1,7 @@
 module BigRecord
   module EmbeddedAssociations
     class AssociationProxy #:nodoc:
-      instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|proxy_)/ }
+      instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|proxy_|object_id)/ }
 
       def find(id)
         @target.select{|s| s.id == id}.first

data/lib/big_record/validations.rb

@@ -246,8 +246,10 @@ module BigRecord
       # whether or not to validate the record.  See #validates_each.
       def evaluate_condition(condition, record)
         case condition
-          when Symbol: record.send(condition)
-          when String: eval(condition, binding)
+          when Symbol
+            record.send(condition)
+          when String
+            eval(condition, binding)
           else
             if condition_block?(condition)
               condition.call(record)

data/lib/big_record/version.rb

@@ -0,0 +1,3 @@
+module BigRecord
+  VERSION = File.read(File.join(File.dirname(__FILE__), "..", "..", "VERSION")).chomp.freeze
+end

data/lib/big_record.rb

@@ -53,6 +53,7 @@ require dir + '/family_span_columns'
 require dir + '/migration'
 require dir + '/connection_adapters'
 require dir + '/fixtures'
+require dir + '/version'
 
 # Add support for collections to tag builders
 require dir + '/action_view_extensions'

data/spec/adapter_benchmark.rb

@@ -9,11 +9,13 @@
 
 require 'rubygems'
 require 'benchmark'
-require 'pathname'
 require 'ruby-debug'
 
-SPEC_ROOT = Pathname(__FILE__).dirname.expand_path
-require SPEC_ROOT.parent + 'lib/big_record'
+bigrecord_driver_path = File.expand_path(File.dirname(__FILE__)+'/../../bigrecord-driver/lib')
+$:.unshift(bigrecord_driver_path) if File.directory?(bigrecord_driver_path) && !$:.include?(bigrecord_driver_path)
+
+SPEC_ROOT = File.expand_path(File.dirname(__FILE__))
+require SPEC_ROOT + '/../lib/big_record'
 
 BigRecord::Base.configurations = YAML::load(File.open(File.join(File.dirname(__FILE__), "connections", "bigrecord.yml")))
 BigRecord::Base.logger = Logger.new(File.join(File.dirname(__FILE__), "benchmark.log"))
@@ -53,3 +55,5 @@ Benchmark.bm do |x|
     end
   end
 end
+
+Book.delete_all

data/spec/connections/bigrecord.yml

@@ -1,7 +1,7 @@
-hbase_rest:
+hbase:
   adapter: hbase_rest
   api_address: http://localhost:8080
-hbase:
+hbase_brd:
   adapter: hbase
   zookeeper_quorum: localhost
   zookeeper_client_port: 2181

data/spec/spec.opts

@@ -1,4 +1,4 @@
 --colour
 --loadby random
 --format progress
---debugger
+--debugger

data/spec/spec_helper.rb

@@ -1,11 +1,11 @@
-require 'pathname'
 require 'rubygems'
-
-gem 'rspec', '~>1.2'
 require 'spec'
 
-SPEC_ROOT = Pathname(__FILE__).dirname.expand_path
-require SPEC_ROOT.parent + 'lib/big_record'
+bigrecord_driver_path = File.expand_path(File.dirname(__FILE__)+'/../../bigrecord-driver/lib')
+$:.unshift(bigrecord_driver_path) if File.directory?(bigrecord_driver_path) && !$:.include?(bigrecord_driver_path)
+
+SPEC_ROOT = File.expand_path(File.dirname(__FILE__))
+require SPEC_ROOT + '/../lib/big_record'
 
 if ENV["HBASE_REST_ADDRESS"]
   config = YAML::load(File.open(File.join(File.dirname(__FILE__), "connections", "bigrecord.yml")))
@@ -58,4 +58,4 @@ class Hash
     other_hash.subset_of?(self)
   end
 
-end
+end

data/tasks/data_store.rake

@@ -0,0 +1,25 @@
+namespace :data_store do
+  require File.join(File.dirname(__FILE__), "..", "lib", "big_record")
+
+  if ENV["HBASE_REST_ADDRESS"]
+    config = YAML::load(File.open(File.join(ROOT, "spec", "connections", "bigrecord.yml")))
+    config["hbase"]["api_address"] = ENV["HBASE_REST_ADDRESS"]
+    BigRecord::Base.configurations = config
+  else
+    BigRecord::Base.configurations = YAML::load(File.open(File.join(ROOT, "spec", "connections", "bigrecord.yml")))
+  end
+  BigRecord::Base.logger = Logger.new(File.expand_path(File.join(ROOT, "migrate.log")))
+
+  @migrations_path = File.expand_path(File.join(ROOT, "spec", "lib", "migrations"))
+
+  desc 'Migrate the test schema for the data store specified by ENV=<data_store>'
+  task :migrate do
+    environment = ENV['ENV']
+    raise ArgumentError, "Usage: rake data_store:migrate ENV=<#{DATA_STORES.join("|")}>" unless environment
+
+    BigRecord::Base.establish_connection environment
+
+    BigRecord::Migrator.migrate(@migrations_path, ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
+  end
+
+end

data/tasks/{spec.rb → spec.rake}

@@ -1,3 +1,6 @@
+require 'spec'
+require 'spec/rake/spectask'
+
 desc "Run #{DATA_STORES.join(" and ")} specs"
 task :spec => DATA_STORES.map{|store| "spec:#{store}" }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bigrecord
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors: 
 - openplaces.org
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-02 00:00:00 -05:00
+date: 2010-02-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -125,6 +125,7 @@ files:
 - lib/big_record/routing_ext.rb
 - lib/big_record/timestamp.rb
 - lib/big_record/validations.rb
+- lib/big_record/version.rb
 - lib/bigrecord.rb
 - rails/init.rb
 - spec/adapter_benchmark.rb
@@ -165,10 +166,10 @@ files:
 - spec/unit/scanner_spec.rb
 - spec/unit/validations_spec.rb
 - tasks/bigrecord_tasks.rake
-- tasks/data_store.rb
-- tasks/gem.rb
-- tasks/rdoc.rb
-- tasks/spec.rb
+- tasks/data_store.rake
+- tasks/gem.rake
+- tasks/rdoc.rake
+- tasks/spec.rake
 - LICENSE
 - README.rdoc
 has_rdoc: true
@@ -198,6 +199,6 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Object mapper for supporting column-oriented data stores (supports hbase cassandra) in Ruby on Rails.
+summary: Object mapper for supporting column-oriented data stores (supports hbase) in Ruby on Rails.
 test_files: []
 

data/tasks/data_store.rb

@@ -1,53 +0,0 @@
-namespace :data_store do
-  require 'lib/big_record'
-
-  if ENV["HBASE_REST_ADDRESS"]
-    config = YAML::load(File.open(File.join(ROOT, "spec", "connections", "bigrecord.yml")))
-    config["hbase"]["api_address"] = ENV["HBASE_REST_ADDRESS"]
-    BigRecord::Base.configurations = config
-  else
-    BigRecord::Base.configurations = YAML::load(File.open(File.join(ROOT, "spec", "connections", "bigrecord.yml")))
-  end
-  BigRecord::Base.logger = Logger.new(File.expand_path(File.join(ROOT, "migrate.log")))
-
-  @migrations_path = File.expand_path(File.join(ROOT, "spec", "lib", "migrations"))
-
-  desc 'Migrate the test schema for the data store specified by ENV=<data_store>'
-  task :migrate do
-    environment = ENV['ENV']
-    raise ArgumentError, "Usage: rake data_store:migrate ENV=<#{DATA_STORES.join("|")}>" unless environment
-
-    BigRecord::Base.establish_connection environment
-
-    BigRecord::Migrator.migrate(@migrations_path, ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
-  end
-
-  namespace :migrate do
-    desc 'Runs the "up" for a given migration VERSION.'
-    task :up do
-      environment = ENV['ENV']
-      raise ArgumentError, "Usage: rake data_store:migrate:up ENV=<#{DATA_STORES.join("|")}>" unless environment
-
-      BigRecord::Base.establish_connection environment
-
-      version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
-      raise "VERSION is required" unless version
-
-      BigRecord::Migrator.run(:up, @migrations_path, version)
-    end
-
-    desc 'Runs the "down" for a given migration VERSION.'
-    task :down do
-      environment = ENV['ENV']
-      raise ArgumentError, "Usage: rake data_store:migrate:down ENV=<#{DATA_STORES.join("|")}>" unless environment
-
-      BigRecord::Base.establish_connection environment
-
-      version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
-      raise "VERSION is required" unless version
-
-      BigRecord::Migrator.run(:down, @migrations_path, version)
-    end
-  end
-
-end