perpetuity 1.0.0.beta → 1.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e6705adfb6aafad45d73afe6fd8fc8da9ecb7d0
-  data.tar.gz: c7bb3bc720c641e4b5951188591279b4fda33baa
+  metadata.gz: 5a1455076e7e95dfb019c9d2dde967df36e40ef5
+  data.tar.gz: f35c774af07f2890d4f012067694c888b4ad5c1d
 SHA512:
-  metadata.gz: 94d4440cfb7076313402de2f8055d81fc7151504dacc1bc3e7004549ab60605f04f3cf6342dcd56893dd85e4714d39327ffe240b31fd51ebe9cb2342261c4941
-  data.tar.gz: 8d868e8b3ba8a5fdc63b9a8ac2e32ff24bcac8b09275cadff37262be8e7ef1e39586b7c067e50627247131249a3692f467e635855332cf1350a617192d03bbf6
+  metadata.gz: e9cdc1e4fadbc9efeafc7887a42a0ed759472b0439de8519e6ad4d557eb910637dda9b247d0f06643e2dccc59cb4819746de06179dfbdbc01a84b3e9549cd314
+  data.tar.gz: 4ebd69b7c403320f2748e62dabc6f237c69bc2b21c59b2cf1e0426dbb7068735355e99445ebfedc2ba7527c456c5154c282304bce168273a1a031195ea1dad45

data/.travis.yml

@@ -1,8 +1,10 @@
 language: ruby
 rvm:
   - 1.9.3
-  - rbx-19mode
-  - jruby-19mode
+  - rbx
   - 2.0.0
+matrix:
+  allow_failures:
+    - rvm: rbx
 services:
   - mongodb

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## Version 1.0.0.beta2
+
+- Allow data source to be configured with a URI. This lets you say `Perpetuity.data_source "postgres://user:password@postgres.example.com:5432/my_database"`, keeping you from having to split up the URI yourself.
+- Remove overreaching rescue clauses to let exceptions get rescued inside the adapters
+- Allow AttributeSet to be initialized w/ attributes
+- Remove Mongo-specific code
+
+
 ## Version 1.0.0.beta
 
 - Duplicate objects properly for the identity map. The identity map holds references to objects pulled out of the DB. We need to duplicate these references on insertion and retrieval from the identity map to make sure that modifications to an object do not pollute the version in the identity map.

data/README.md

@@ -13,26 +13,22 @@ In the Data Mapper pattern, the objects you work with don't understand how to pe
 Add the following to your Gemfile and run `bundle` to install it.
 
 ```ruby
-gem 'perpetuity'
+gem 'perpetuity-mongodb', '~> 1.0.0.beta'  # if using MongoDB
+gem 'perpetuity-postgres'                  # if using Postgres
 ```
 
-**NOTE:** In version 1.0, you will need to install the Perpetuity database adapter, which will pull in the core Perpetuity gem:
-
-```ruby
-gem 'perpetuity/mongodb'  # if using MongoDB
-gem 'perpetuity/postgres' # if using Postgres
-```
+Note that you do not need to explicitly declare the `perpetuity` gem as a dependency. The database adapter takes care of that for you. It works just like including `rspec-rails` into your Rails app.
 
 ## Configuration
 
-The only currently supported persistence method is MongoDB, but stay tuned for the [Postgres adapter](https://github.com/jgaskins/perpetuity-postgres). Other schemaless solutions can probably be implemented easily. The simplest configuration is with the following line:
+The only currently-1.0-quality adapter is MongoDB, but stay tuned for the [Postgres adapter](https://github.com/jgaskins/perpetuity-postgres). The simplest configuration is with the following line:
 
 ```ruby
 Perpetuity.data_source :mongodb, 'my_mongo_database'
 Perpetuity.data_source :postgres, 'my_pg_database'
 ```
 
-*Note:* You cannot use different databases in the same app like that. At least, not yet. :-)
+*Note:* You cannot use different databases in the same app like that. At least, not yet. :-) Possibly a 1.1 feature?
 
 If your database is on another server/port or you need authentication, you can specify those as options:
 
@@ -43,6 +39,8 @@ Perpetuity.data_source :mongodb, 'my_database', host: 'mongo.example.com',
                                                 password: 'password'
 ```
 
+If you are using Perpetuity with a multithreaded application, you can specify a `:pool_size` parameter to set up a connection pool. If you omit this parameter, it will use the data source's default pool size.
+
 ## Setting up object mappers
 
 Object mappers are generated by the following:

data/lib/perpetuity/attribute.rb

@@ -24,11 +24,16 @@ module Perpetuity
     end
 
     def to_s
-      name
+      name.to_s
     end
 
     def =~ regexp
       name.to_s =~ regexp
     end
+
+    def == other
+      other.is_a?(self.class) &&
+      name.to_s == other.name.to_s
+    end
   end
 end

data/lib/perpetuity/attribute_set.rb

@@ -2,12 +2,16 @@ module Perpetuity
   class AttributeSet
     include Enumerable
 
-    def initialize
+    def initialize *attributes
       @attributes = {}
+      attributes.each do |attribute|
+        self << attribute
+      end
     end
 
     def << attribute
       @attributes[attribute.name] = attribute
+      self
     end
 
     def [] name

data/lib/perpetuity/config.rb

@@ -1,11 +1,58 @@
+require 'uri'
+
 module Perpetuity
   class Configuration
     def data_source *args
       if args.any?
-        @db = args.pop
+        db = args.first
+
+        case db
+        when String
+          args[0] = URI(args[0])
+          @db = data_source_from_url(*args)
+        when Symbol
+          adapter = args.shift
+          db_name = args.shift
+          options = args.shift || {}
+          adapter_class = Perpetuity.const_get(adapter(adapter))
+
+          @db = adapter_class.new(options.merge(db: db_name))
+        end
       end
 
       @db
     end
+
+    def data_source_from_url *args
+      uri = args.shift
+      options = args.shift || {}
+
+      protocol = uri.scheme
+      klass = Perpetuity.const_get(adapter(protocol))
+      db_options = {
+        db: uri.path[1..-1],
+        username: uri.user,
+        password: uri.password,
+        host: uri.host,
+        port: uri.port,
+      }
+      if options.key? :pool_size
+        db_options[:pool_size] = options[:pool_size]
+      end
+
+      klass.new(db_options)
+    end
+
+    def self.adapters
+      @adapters ||= {
+        dynamodb: 'DynamoDB',
+        mongodb:  'MongoDB',
+        postgres: 'Postgres',
+      }
+    end
+
+    def adapter name
+      self.class.adapters[name.to_sym]
+    end
   end
 end

data/lib/perpetuity/mapper.rb

@@ -202,15 +202,13 @@ module Perpetuity
     end
 
     def increment object, attribute, count=1
-      data_source.increment mapped_class, id_for(object), attribute, count
-    rescue Moped::Errors::OperationFailure
-      raise ArgumentError.new('Attempted to increment a non-numeric value')
+      id = id_for(object) || object
+      data_source.increment mapped_class, id, attribute, count
     end
 
     def decrement object, attribute, count=1
-      data_source.increment mapped_class, id_for(object), attribute, -count
-    rescue Moped::Errors::OperationFailure
-      raise ArgumentError.new('Attempted to decrement a non-numeric value')
+      id = id_for(object) || object
+      data_source.increment mapped_class, id, attribute, -count
     end
 
     def sample

data/lib/perpetuity/version.rb

@@ -1,3 +1,3 @@
 module Perpetuity
-  VERSION = "1.0.0.beta"
+  VERSION = "1.0.0.beta2"
 end

data/lib/perpetuity.rb

@@ -27,11 +27,8 @@ module Perpetuity
     @mapper_registry ||= MapperRegistry.new
   end
 
-  def self.data_source adapter, db_name, options={}
-    adapters = { dynamodb: 'DynamoDB', mongodb: 'MongoDB', postgres: 'Postgres' }
-    adapter_class = const_get(adapters[adapter])
-
-    configure { data_source adapter_class.new(options.merge(db: db_name)) }
+  def self.data_source *args
+    configure { data_source *args }
   end
 
   # Necessary to be able to check whether Rails is loaded and initialized

data/spec/integration/indexing_spec.rb

@@ -4,7 +4,7 @@ describe 'indexing' do
   let(:mapper_class) do
     Class.new(Perpetuity::Mapper) do
       map Object
-      attribute :name
+      attribute :name, type: String
       index :name, unique: true
     end
   end
@@ -18,7 +18,7 @@ describe 'indexing' do
   let(:mapper) { mapper_class.new }
   let(:name_index) do
     mapper.indexes.find do |index|
-      index.attribute.to_s == :name
+      index.attribute.name == :name
     end
   end
   let(:db_name) { Perpetuity.configuration.data_source.db }
@@ -39,8 +39,10 @@ describe 'indexing' do
 
   it 'creates indexes' do
     mapper.reindex!
+    mapper.data_source.active_indexes(Object).map do |index|
+      index.attribute.name.to_s
+    end.should include 'name'
     name_index.should be_active
-    mapper.remove_index! name_index
   end
 
   it 'specifies uniqueness of the index' do

data/spec/integration/retrieval_spec.rb

@@ -223,4 +223,30 @@ describe "retrieval" do
     retrieved.title.should be_a String
     retrieved.title.should == fake_title
   end
+
+  describe 'Enumerable methods within queries' do
+    let(:article_with_comments) do
+      Article.new(SecureRandom.hex, SecureRandom.hex).tap do |a|
+        a.comments << Comment.new
+      end
+    end
+    let(:article_without_comments) do
+      Article.new(SecureRandom.hex, SecureRandom.hex)
+    end
+    let(:articles) { [ article_with_comments, article_without_comments ] }
+
+    before { mapper.insert articles }
+
+    it 'checks for the existence of attributes in an array' do
+      results = mapper.select { |article| article.comments.any? }.to_a
+      results.should include article_with_comments
+      results.should_not include article_without_comments
+    end
+
+    it 'checks that an array has no elements' do
+      results = mapper.select { |article| article.comments.none? }.to_a
+      results.should include article_without_comments
+      results.should_not include article_with_comments
+    end
+  end
 end

data/spec/integration/update_spec.rb

@@ -90,21 +90,5 @@ describe 'updating' do
       mapper.decrement article, :views, 10
       mapper.find(mapper.id_for(article)).views.should == view_count - 11
     end
-
-    context 'with an object with the specified attribute missing' do
-      let(:article) { Article.new('title', 'body', nil, nil, nil) }
-
-      it 'raises an exception when incrementing' do
-        expect { mapper.increment article, :views }.to raise_error(
-          ArgumentError, 'Attempted to increment a non-numeric value')
-      end
-
-      it 'raises an exception when decrementing' do
-        expect { mapper.decrement article, :views }.to raise_error(
-          ArgumentError, 'Attempted to decrement a non-numeric value')
-      end
-    end
   end
 end
-
-

data/spec/perpetuity/attribute_spec.rb

@@ -26,5 +26,9 @@ module Perpetuity
     it 'can match a regex' do
       expect(attribute =~ /article/).to be_true
     end
+
+    it 'uses its name when converted to a string' do
+      attribute.to_s.should == 'article'
+    end
   end
 end

data/spec/perpetuity/config_spec.rb

@@ -1,13 +1,36 @@
 require 'perpetuity/config'
+require 'perpetuity/postgres'
 
 module Perpetuity
   describe Configuration do
     let(:config) { Configuration.new }
 
     it 'sets a data source' do
-      db = double('db')
-      config.data_source db
-      config.data_source.should == db
+      config.data_source :postgres,
+                         'perpetuity',
+                         username: 'username',
+                         password: 'password',
+                         host: 'host',
+                         port: 1337
+
+      config.data_source.should be_a Postgres
+      config.data_source.db.should == 'perpetuity'
+      config.data_source.username.should == 'username'
+      config.data_source.password.should == 'password'
+      config.data_source.host.should == 'host'
+      config.data_source.port.should == 1337
+    end
+
+    it 'allows a URL as its data source' do
+      db = "postgres://username:password@host:1337/database"
+      data_source = config.data_source(db, pool_size: 20)
+      data_source.should be_a Postgres
+      data_source.username.should == 'username'
+      data_source.password.should == 'password'
+      data_source.host.should == 'host'
+      data_source.port.should == 1337
+      data_source.db.should == 'database'
+      data_source.pool_size.should == 20
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perpetuity
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta
+  version: 1.0.0.beta2
 platform: ruby
 authors:
 - Jamie Gaskins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-15 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Persistence library allowing serialization of Ruby objects