dm-pg-types 0.8.1 → 0.8.2

data/Gemfile

@@ -16,6 +16,8 @@ gem 'dm-do-adapter',      DM_VERSION
 gem 'dm-postgres-adapter', DM_VERSION
 
 gem 'rake',           '~> 0.9.2'
-gem 'rspec',          '~> 1.3.2'
 
-gem 'jeweler', '~> 1.8.4'
+group :development do
+  gem 'rspec', '~> 1.3.2'
+  gem 'jeweler', '~> 1.8.4'
+end

data/Gemfile.lock

@@ -15,14 +15,14 @@ GEM
     dm-postgres-adapter (1.2.0)
       dm-do-adapter (~> 1.2.0)
       do_postgres (~> 0.10.6)
-    dm-types (1.2.1)
-      bcrypt-ruby (~> 3.0.0)
+    dm-types (1.2.2)
+      bcrypt-ruby (~> 3.0)
       dm-core (~> 1.2.0)
-      fastercsv (~> 1.5.4)
-      json (~> 1.6.1)
-      multi_json (~> 1.0.3)
-      stringex (~> 1.3.0)
-      uuidtools (~> 2.1.2)
+      fastercsv (~> 1.5)
+      json (~> 1.6)
+      multi_json (~> 1.0)
+      stringex (~> 1.4)
+      uuidtools (~> 2.1)
     dm-validations (1.2.0)
       dm-core (~> 1.2.0)
     do_postgres (0.10.8)
@@ -34,14 +34,14 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.6.7)
-    multi_json (1.0.4)
+    json (1.7.5)
+    multi_json (1.3.6)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
     rspec (1.3.2)
-    stringex (1.3.3)
-    uuidtools (2.1.2)
+    stringex (1.4.0)
+    uuidtools (2.1.3)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,24 +1,34 @@
 # dm-pg-types
 
+# Installation
+
+dm-pg-types is available as a RubyGem. Simply put this in your Gemfile
+
+```
+gem 'dm-pg-types'
+```
+
+and you should be good to go.
+
 DataMapper plugin providing support for PostgreSQL's HSTORE and ARRAY types. An example will suffice
 
 ```ruby
-DataMapper.setup(:default, 'postgres://svs@localhost/dm_pg_types_person')
+DataMapper.setup(:default, 'postgres://localhost/dm_pg_types_person')
 DataMapper.repository(:default).adapter.execute("DROP TABLE IF EXISTS people")
 DataMapper.repository(:default).adapter.execute("CREATE EXTENSION HSTORE")
 
 class Person
   include DataMapper::Resource
-      
+
   property :id,        Serial
   property :name,      String
   property :info,      HStore
   property :decimals,  DecimalArray, :scale => 5, :precision => 10
 end
-    
+
 DataMapper.finalize
 DataMapper.auto_migrate!
-    
+
 p = Person.new
 p.info = {:a => "b", :c => "d"}
 p.decimals = [10.1, 11.2]

data/Rakefile

@@ -19,7 +19,7 @@ begin
     gem.add_dependency 'data_mapper', '~> 1.2.0'	
     gem.add_dependency 'dm-postgres-adapter', '~> 1.2.0'	
     
-    gem.version = "0.8.1"
+    gem.version = "0.8.2"
   end
 
   Jeweler::GemcutterTasks.new

data/dm-pg-types.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dm-pg-types"
-  s.version = "0.8.1"
+  s.version = "0.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["svs"]
-  s.date = "2012-09-08"
+  s.date = "2012-09-19"
   s.description = "DataMapper plugin providing HSTORE and ARRAY datatype support for postgres"
   s.email = "svs [a] svs [d] io"
   s.extra_rdoc_files = [
@@ -28,17 +28,21 @@ Gem::Specification.new do |s|
     "lib/dm-pg-types.rb",
     "lib/dm-pg-types/decimal_array.rb",
     "lib/dm-pg-types/hstore.rb",
+    "lib/dm-pg-types/pg_array.rb",
+    "lib/dm-pg-types/string_array.rb",
     "spec/fixtures/person.rb",
     "spec/integration/decimal_array_spec.rb",
     "spec/integration/full_spec.rb",
     "spec/integration/hstore_spec.rb",
+    "spec/integration/string_array_spec.rb",
     "spec/rcov.opts",
     "spec/shared/flags_shared_spec.rb",
     "spec/shared/identity_function_group.rb",
     "spec/spec.opts",
     "spec/spec_helper.rb",
+    "spec/unit/decimal_array_spec.rb",
     "spec/unit/hstore_spec.rb",
-    "spec/unit/pg_array_spec.rb",
+    "spec/unit/string_array_spec.rb",
     "tasks/spec.rake",
     "tasks/yard.rake",
     "tasks/yardstick.rake"
@@ -62,8 +66,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<dm-do-adapter>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<dm-postgres-adapter>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<rake>, ["~> 0.9.2"])
-      s.add_runtime_dependency(%q<rspec>, ["~> 1.3.2"])
-      s.add_runtime_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3.2"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_runtime_dependency(%q<data_mapper>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<dm-postgres-adapter>, ["~> 1.2.0"])
     else

data/lib/dm-pg-types.rb

@@ -5,19 +5,25 @@ require 'dm-postgres-adapter'
 
 module DataMapper
   class Property
+    autoload :PgArray,            'dm-pg-types/pg_array'
     autoload :HStore,             'dm-pg-types/hstore'
     autoload :DecimalArray,       'dm-pg-types/decimal_array'
+    autoload :StringArray,        'dm-pg-types/string_array'
   end
 
   module Migrations
     module PostgresAdapter
       def property_schema_hash(property)
         schema = super
-        
+
         if property.kind_of?(Property::DecimalArray)
           schema[:primitive] = "#{schema[:primitive]}(#{property.precision},#{property.scale})[]"
           schema[:precision] = schema[:scale] = nil
+        elsif property.kind_of?(Property::StringArray)
+          schema[:primitive] = "#{schema[:primitive]}(#{property.length})[]"
+          schema[:length] = nil
         end
+
         schema
       end
     end
@@ -27,7 +33,7 @@ module DataMapper
     def self.included(base)
       base.extend ClassMethods
     end
-    
+
     module ClassMethods
       # Types for PostgreSQL databases.
       #
@@ -37,7 +43,8 @@ module DataMapper
       def type_map
         super.merge(
                     Property::HStore => {:primitive => 'HSTORE'},
-                    Property::DecimalArray => {:primitive => "NUMERIC"}
+                    Property::DecimalArray => {:primitive => "NUMERIC"},
+                    Property::StringArray => {:primitive => "VARCHAR"}
                     ).freeze
       end
     end

data/lib/dm-pg-types/decimal_array.rb

@@ -2,7 +2,7 @@ require 'dm-core'
 
 module DataMapper
   class Property
-    class DecimalArray < Object
+    class DecimalArray < PgArray
       accept_options :precision, :scale, :min, :max
       attr_reader :precision, :scale, :min, :max
 
@@ -18,11 +18,7 @@ module DataMapper
 
 
       def load(value)
-        value.gsub(/[{}]/,'').split(",").map(&:to_f) if value
-      end
-
-      def dump(value)
-        "{#{value.join(",")}}" if value
+        super.map(&:to_f) if value
       end
     end # class DecimalArray
   end # class Property

data/lib/dm-pg-types/pg_array.rb

@@ -0,0 +1,16 @@
+require 'dm-core'
+require 'csv'
+
+module DataMapper
+  class Property
+    class PgArray < Object
+      def load(value)
+        CSV.parse_line(value.gsub(/[{}]/,'')) || [] if value
+      end
+
+      def dump(value)
+        "{#{CSV.generate_line(value, :row_sep => '')}}" if value
+      end
+    end # class PgArray
+  end # class Property
+end # module DataMapper

data/lib/dm-pg-types/string_array.rb

@@ -0,0 +1,25 @@
+require 'dm-core'
+
+module DataMapper
+  class Property
+    class StringArray < PgArray
+      accept_options :length
+
+      DEFAULT_LENGTH = 50
+      length(DEFAULT_LENGTH)
+
+      def length
+        if @length.kind_of?(Range)
+          @length.max
+        else
+          @length
+        end
+      end
+
+      def initialize(model, name, options = {})
+        super
+        @length = @options.fetch(:length)
+      end
+    end # class StringArray
+  end # class Property
+end # module DataMapper

data/spec/fixtures/person.rb

@@ -15,6 +15,7 @@ module DataMapper
       property :name,       String
       property :other_information, HStore
       property :numbers,    DecimalArray
+      property :aliases,    StringArray
     end
   end
 end

data/spec/integration/decimal_array_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 
-require 'debugger'
 try_spec do
 
   require './spec/fixtures/person'
@@ -35,7 +34,6 @@ try_spec do
 
         describe 'when dumped and loaded again' do
           before :all do
-            debugger
             @resource.save.should be(true)
             @resource.reload
           end

data/spec/integration/full_spec.rb

@@ -3,28 +3,30 @@ require 'spec_helper'
 describe "dm-pg-types" do
   before :all do
     # Create the table manually before running this spec.
-    DataMapper.setup(:default, 'postgres://svs@localhost/dm_pg_types_person')
+    DataMapper.setup(:default, 'postgres://localhost/dm_pg_types_person')
     DataMapper.repository(:default).adapter.execute("DROP TABLE IF EXISTS people")
     DataMapper.repository(:default).adapter.execute("CREATE EXTENSION HSTORE") rescue nil
     class Person
       include DataMapper::Resource
-      
+
       property :id, Serial
       property :name, String
       property :info, HStore
       property :decimals, DecimalArray, :scale => 5, :precision => 10
+      property :aliases, StringArray, :length => 10
     end
-    
+
     DataMapper.finalize
     DataMapper.auto_migrate!
-    
+
     p = Person.new
     p.info = {:a => "b", :c => "d"}
     p.decimals = [10.1, 11.2]
+    p.aliases = ["Bob", "George"]
     p.save
     @p = Person.last
   end
-  
+
   it "should provide a person with info" do
     @p.info.should == {"a" => "b", "c" => "d"}
   end
@@ -33,4 +35,8 @@ describe "dm-pg-types" do
     @p.decimals.should == [10.1,11.2]
   end
 
+  it "should provide a person with aliases" do
+    @p.aliases.should == ['Bob', 'George']
+  end
+
 end

data/spec/integration/string_array_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+try_spec do
+
+  require './spec/fixtures/person'
+
+  describe DataMapper::TypesFixtures::Person do
+    supported_by :all do
+      before :all do
+        @resource = DataMapper::TypesFixtures::Person.new(:name => '')
+      end
+
+      describe 'with no other information' do
+        before :all do
+          @resource.aliases = nil
+        end
+
+        describe 'when dumped and loaded again' do
+          before :all do
+            @resource.save.should be(true)
+            @resource.reload
+          end
+
+          it 'has no aliases' do
+            @resource.aliases.should == nil
+          end
+        end
+      end
+
+      describe 'with no aliases information' do
+        before :all do
+          @resource.aliases = []
+        end
+
+        describe 'when dumped and loaded again' do
+          before :all do
+            @resource.save.should be(true)
+            @resource.reload
+          end
+
+          it 'has empty aliases list' do
+            @resource.aliases.should == []
+          end
+        end
+      end
+
+      describe 'with a few items on the aliases list' do
+        before :all do
+          @input = ['Bob','George','Michael']
+          @resource.aliases = @input
+        end
+
+        describe 'when dumped and loaded again' do
+          before :all do
+            @resource.save.should be(true)
+            @resource.reload
+          end
+
+          it 'includes saved aliases' do
+            @resource.aliases.should  == ['Bob','George','Michael']
+          end
+
+        end
+      end
+    end
+  end
+end

data/spec/unit/string_array_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+try_spec do
+  describe DataMapper::Property::StringArray do
+    supported_by :all do
+      before :all do
+        class User
+          include DataMapper::Resource
+          property :id, Serial
+          property :things, StringArray, :length => 10
+        end
+
+        @property = User.properties[:things]
+      end
+
+      describe '.load' do
+        describe "argument is a string that is a string array" do
+          before :all do
+            @input = '{"10.1","2.3","4","5","6"}'
+            @result = @property.load(@input)
+          end
+
+          it "parses the input into an array" do
+            @result.should == ['10.1','2.3','4','5','6']
+          end
+        end
+      end
+
+      describe ".dump" do
+        before :all do
+          @input = ['foo','bar','baz','quux','foo,bar']
+          @result = @property.dump(@input)
+        end
+
+        describe "when argument is an Array" do
+          it "should result in a postgres array string" do
+            @result.should == '{foo,bar,baz,quux,"foo,bar"}'
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm-pg-types
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-08 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core
@@ -163,7 +163,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.2
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -179,7 +179,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.4
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -238,17 +238,21 @@ files:
 - lib/dm-pg-types.rb
 - lib/dm-pg-types/decimal_array.rb
 - lib/dm-pg-types/hstore.rb
+- lib/dm-pg-types/pg_array.rb
+- lib/dm-pg-types/string_array.rb
 - spec/fixtures/person.rb
 - spec/integration/decimal_array_spec.rb
 - spec/integration/full_spec.rb
 - spec/integration/hstore_spec.rb
+- spec/integration/string_array_spec.rb
 - spec/rcov.opts
 - spec/shared/flags_shared_spec.rb
 - spec/shared/identity_function_group.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/unit/decimal_array_spec.rb
 - spec/unit/hstore_spec.rb
-- spec/unit/pg_array_spec.rb
+- spec/unit/string_array_spec.rb
 - tasks/spec.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
@@ -266,7 +270,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3719502644642354910
+      hash: -3868045948250256032
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: