activerecord-postgres-hstore 0.4.1 → 0.5.0

data/Gemfile

@@ -2,7 +2,9 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 gem 'rails'
 gem 'rake'
-gem 'pg'
+
+gem 'pg', :platforms => :ruby
+gem 'activerecord-jdbcpostgresql-adapter', :platforms => :jruby
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -22,6 +22,10 @@ GEM
       activesupport (= 3.2.8)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
+    activerecord-jdbc-adapter (1.2.2.1)
+    activerecord-jdbcpostgresql-adapter (1.2.2.1)
+      activerecord-jdbc-adapter (~> 1.2.2.1)
+      jdbc-postgres (>= 9.0, < 9.2)
     activeresource (3.2.8)
       activemodel (= 3.2.8)
       activesupport (= 3.2.8)
@@ -35,6 +39,7 @@ GEM
     git (1.2.5)
     hike (1.2.1)
     i18n (0.6.1)
+    jdbc-postgres (9.1.901)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -101,9 +106,11 @@ GEM
     tzinfo (0.3.33)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
+  activerecord-jdbcpostgresql-adapter
   bundler (~> 1.1.3)
   jeweler (~> 1.8.3)
   pg

data/README.md

@@ -25,7 +25,7 @@ Notes for Rails 3.1 and above
 The master branch already support a custom serialization coder.
 If you want to use it just put in your Gemfile:
 
-    gem 'activerecord-postgres-hstore', git: 'git://github.com/softa/activerecord-postgres-hstore.git'
+    gem 'activerecord-postgres-hstore', github: 'engageis/activerecord-postgres-hstore'
 
 If you install them gem from the master branch you also have to insert a
 line in each model that uses hstore.
@@ -156,6 +156,18 @@ To avoid the above, make sure all named parameters are strings:
 
 Have fun.
 
+Test Database
+-------------
+
+To have hstore enabled when you load your database schema (as happens in rake db:test:prepare), you'll need to
+uncomment or add the following line in config/application.rb
+
+    config.active_record.schema_format = :sql
+
+This will change your schema dumps from Ruby to SQL. If you're
+unsure about the implications of this change, we suggest reading this
+[Rails Guide](http://guides.rubyonrails.org/migrations.html#schema-dumping-and-you).
+
 Help
 ----
 

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.5.0

data/activerecord-postgres-hstore.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "activerecord-postgres-hstore"
-  s.version = "0.4.1"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Juan Maiz", "Diogo Biazus"]
-  s.date = "2012-09-14"
+  s.date = "2013-01-03"
   s.description = "This gem adds support for the postgres hstore type. It is the _just right_ alternative for storing hashes instead of using seralization or dynamic tables."
   s.email = "juanmaiz@gmail.com"
   s.extra_rdoc_files = [
@@ -105,6 +105,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rails>, [">= 0"])
       s.add_runtime_dependency(%q<rake>, [">= 0"])
       s.add_runtime_dependency(%q<pg>, [">= 0"])
+      s.add_runtime_dependency(%q<activerecord-jdbcpostgresql-adapter>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.1.3"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
@@ -114,6 +115,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rails>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<pg>, [">= 0"])
+      s.add_dependency(%q<activerecord-jdbcpostgresql-adapter>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.1.3"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
@@ -124,6 +126,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rails>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<pg>, [">= 0"])
+    s.add_dependency(%q<activerecord-jdbcpostgresql-adapter>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.1.3"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])

data/app/Gemfile

@@ -1,7 +1,8 @@
 source 'http://rubygems.org'
 
 gem 'rails', '3.0.0'
-gem 'pg'
+gem 'pg', :platforms => :ruby
+gem 'activerecord-jdbcpostgresql-adapter', :platforms => :jruby
 gem 'activerecord-postgres-hstore', :path => '../'
 
 # Use unicorn as the web server

data/lib/activerecord-postgres-hstore.rb

@@ -1,4 +1,18 @@
-require "activerecord-postgres-hstore/railties"
+require 'active_support'
+
+if RUBY_PLATFORM == "jruby"
+  require 'activerecord-jdbcpostgresql-adapter'
+else
+  require 'pg'
+end
+
+if defined? Rails
+  require "activerecord-postgres-hstore/railties"
+else
+  ActiveSupport.on_load :active_record do
+    require "activerecord-postgres-hstore/activerecord"
+  end
+end
 require "activerecord-postgres-hstore/string"
 require "activerecord-postgres-hstore/hash"
 require "activerecord-postgres-hstore/coder"

data/lib/activerecord-postgres-hstore/activerecord.rb

@@ -66,29 +66,29 @@ module ActiveRecord
       destroy_keys(attribute, *keys).save
     end
 
-    if defined?(Rails) && Rails.version < '3.1.0'
-    # This method is replaced for Rails 3 compatibility.
-    # All I do is add the condition when the field is a hash that converts the value
-    # to hstore format.
-    # IMHO this should be delegated to the column, so it won't be necessary to rewrite all
-    # this method.
-    def arel_attributes_values(include_primary_key = true, include_readonly_attributes = true, attribute_names = @attributes.keys)
-      attrs = {}
-      attribute_names.each do |name|
-        if (column = column_for_attribute(name)) && (include_primary_key || !column.primary)
-          if include_readonly_attributes || (!include_readonly_attributes && !self.class.readonly_attributes.include?(name))
-            value = read_attribute(name)
-            if self.class.columns_hash[name].type == :hstore && value && value.is_a?(Hash)
-              value = value.to_hstore # Done!
-            elsif value && self.class.serialized_attributes.has_key?(name) && (value.acts_like?(:date) || value.acts_like?(:time) || value.is_a?(Hash) || value.is_a?(Array))
-              value = value.to_yaml
+    if defined? Rails and Rails.version < '3.1.0'
+      # This method is replaced for Rails 3 compatibility.
+      # All I do is add the condition when the field is a hash that converts the value
+      # to hstore format.
+      # IMHO this should be delegated to the column, so it won't be necessary to rewrite all
+      # this method.
+      def arel_attributes_values(include_primary_key = true, include_readonly_attributes = true, attribute_names = @attributes.keys)
+        attrs = {}
+        attribute_names.each do |name|
+          if (column = column_for_attribute(name)) && (include_primary_key || !column.primary)
+            if include_readonly_attributes || (!include_readonly_attributes && !self.class.readonly_attributes.include?(name))
+              value = read_attribute(name)
+              if self.class.columns_hash[name].type == :hstore && value && value.is_a?(Hash)
+                value = value.to_hstore # Done!
+              elsif value && self.class.serialized_attributes.has_key?(name) && (value.acts_like?(:date) || value.acts_like?(:time) || value.is_a?(Hash) || value.is_a?(Array))
+                value = value.to_yaml
+              end
+              attrs[self.class.arel_table[name]] = value
             end
-            attrs[self.class.arel_table[name]] = value
           end
         end
+        attrs
       end
-      attrs
-    end
     end
 
   end
@@ -101,6 +101,49 @@ module ActiveRecord
 
   module ConnectionAdapters
 
+    module SchemaStatements
+
+      # Installs hstore by creating the Postgres extension
+      # if it does not exist
+      #
+      def install_hstore
+        execute "CREATE EXTENSION IF NOT EXISTS hstore"
+      end
+
+      # Uninstalls hstore by dropping Postgres extension if it exists
+      #
+      def uninstall_hstore
+        execute "DROP EXTENSION IF EXISTS hstore"
+      end
+
+      # Adds a GiST or GIN index to a table which has an hstore column.
+      #
+      # Example:
+      #   add_hstore_index :people, :info, :type => :gin
+      #
+      # Options:
+      #   :type  = :gist (default) or :gin
+      #
+      # See http://www.postgresql.org/docs/9.2/static/textsearch-indexes.html for more information.
+      #
+      def add_hstore_index(table_name, column_name, options = {})
+        index_name, index_type, index_columns = add_index_options(table_name, column_name, options)
+        index_type = index_type.present? ? index_type : 'gist'
+        execute "CREATE INDEX #{index_name} ON #{table_name} USING #{index_type}(#{column_name})"
+      end
+
+      # Removes a GiST or GIN index of a table which has an hstore column.
+      #
+      # Example:
+      #   remove_hstore_index :people, :info
+      #
+      def remove_hstore_index(table_name, options = {})
+        index_name = index_name_for_remove(table_name, options)
+        execute "DROP INDEX #{index_name}"
+      end
+
+    end
+
     class TableDefinition
 
       # Adds hstore type for migrations. So you can add columns to a table like:
@@ -133,7 +176,7 @@ module ActiveRecord
 
     end
 
-    class PostgreSQLColumn < Column
+    class PostgreSQLColumn
       # Does the type casting from hstore columns using String#from_hstore or Hash#from_hstore.
       def type_cast_code_with_hstore(var_name)
         type == :hstore ? "#{var_name}.from_hstore" : type_cast_code_without_hstore(var_name)
@@ -148,7 +191,7 @@ module ActiveRecord
       alias_method_chain :simplified_type, :hstore
     end
 
-    class PostgreSQLAdapter < AbstractAdapter
+    class PostgreSQLAdapter
       def native_database_types_with_hstore
         native_database_types_without_hstore.merge({:hstore => { :name => "hstore" }})
       end

data/lib/activerecord-postgres-hstore/railties.rb

@@ -1,14 +1,13 @@
 require 'rails'
 require 'rails/generators'
 require 'rails/generators/migration'
-require 'pg'
 
 # = Hstore Railtie
 #
 # Creates a new railtie for 2 reasons:
 #
 # * Initialize ActiveRecord properly
-# * Add hstore:setup generator 
+# * Add hstore:setup generator
 class Hstore < Rails::Railtie
 
   initializer 'activerecord-postgres-hstore' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgres-hstore
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000Z
+date: 2013-01-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2157171100 !ruby/object:Gem::Requirement
+  requirement: &2161699660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157171100
+  version_requirements: *2161699660
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157170000 !ruby/object:Gem::Requirement
+  requirement: &2161698580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157170000
+  version_requirements: *2161698580
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &2157169120 !ruby/object:Gem::Requirement
+  requirement: &2161697620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157169120
+  version_requirements: *2161697620
+- !ruby/object:Gem::Dependency
+  name: activerecord-jdbcpostgresql-adapter
+  requirement: &2161684980 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2161684980
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2157168140 !ruby/object:Gem::Requirement
+  requirement: &2161683500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157168140
+  version_requirements: *2161683500
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2157166860 !ruby/object:Gem::Requirement
+  requirement: &2161682800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +77,10 @@ dependencies:
         version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *2157166860
+  version_requirements: *2161682800
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2157165660 !ruby/object:Gem::Requirement
+  requirement: &2161681960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +88,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *2157165660
+  version_requirements: *2161681960
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2157164420 !ruby/object:Gem::Requirement
+  requirement: &2161680700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157164420
+  version_requirements: *2161680700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157163540 !ruby/object:Gem::Requirement
+  requirement: &2161679500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +110,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157163540
+  version_requirements: *2161679500
 description: This gem adds support for the postgres hstore type. It is the _just right_
   alternative for storing hashes instead of using seralization or dynamic tables.
 email: juanmaiz@gmail.com
@@ -198,7 +209,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3203326444745733758
+      hash: 2025779825547619244
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: