ardm 0.0.1 → 0.1.0

data/spec/schema.rb

@@ -7,12 +7,19 @@
 
   create_table :articles, :force => true do |t|
     t.string   :title
+    t.string   :author
     t.text     :body
     t.timestamps
     t.datetime :published_at
     t.boolean  :deleted
     t.datetime :deleted_at
     t.string   :slug
+    t.integer  :original_id
+  end
+
+  create_table :article_publications, :force => true do |t|
+    t.integer  :article_id
+    t.integer  :publication_id
   end
 
   create_table :bookmarks, :force => true do |t|
@@ -22,9 +29,14 @@
     t.text       :tags
   end
 
+  create_table :comments, :force => true do |t|
+    t.text     :body
+    t.integer  :user_id
+    t.timestamps
+  end
+
   create_table :images, :force => true, :id => false do |t|
     t.string   :md5hash, :length => 32
-    t.index    :md5hash, :unique => true
     t.string   :title
     t.text     :description, :length => 1024
     t.integer  :width
@@ -32,6 +44,7 @@
     t.string   :format
     t.time     :taken_at
   end
+  add_index :images, :md5hash, :unique => true
 
   create_table :network_nodes, :force => true do |t|
     t.string     :ip_address
@@ -39,6 +52,12 @@
     t.string     :node_uuid
   end
 
+  create_table :paragraphs, :force => true do |t|
+    t.string   :text
+    t.integer  :article_id
+    t.timestamps
+  end
+
   create_table :people, :force => true do |t|
     t.string :name
     t.text   :positions
@@ -71,10 +90,10 @@
     t.string   :name
     t.string   :album
     t.string   :musicbrainz_hash
-    t.index    [:artist, :album]
-    t.index    :name
-    t.index    :musicbrainz_hash, :unique => true
   end
+  add_index :tracks, [:artist, :album]
+  add_index :tracks, :name
+  add_index :tracks, :musicbrainz_hash, :unique => true
 
   create_table :tshirts, :force => true do |t|
     t.string   :writing
@@ -83,4 +102,14 @@
     t.text     :color
     t.text     :size
   end
+
+  create_table :users, :force => true, :id => false, :primary_key => :name do |t|
+    t.string  :name
+    t.integer :age
+    t.text    :summary
+    t.text    :description
+    t.boolean :admin
+    t.integer :parent_id
+    t.string  :referrer_id
+  end
 end

data/spec/semipublic/property/boolean_spec.rb

@@ -15,13 +15,13 @@ describe Ardm::Property::Boolean do
   describe '#valid?' do
     [ true, false ].each do |value|
       it "returns true when value is #{value.inspect}" do
-        property.valid?(value).should be(true)
+        expect(property.valid?(value)).to be(true)
       end
     end
 
     [ 'true', 'TRUE', '1', 1, 't', 'T', 'false', 'FALSE', '0', 0, 'f', 'F' ].each do |value|
       it "returns false for #{value.inspect}" do
-        property.valid?(value).should be(false)
+        expect(property.valid?(value)).to be(false)
       end
     end
   end
@@ -29,19 +29,19 @@ describe Ardm::Property::Boolean do
   describe '#typecast' do
     [ true, 'true', 'TRUE', '1', 1, 't', 'T' ].each do |value|
       it "returns true when value is #{value.inspect}" do
-        property.typecast(value).should be(true)
+        expect(property.typecast(value)).to be(true)
       end
     end
 
     [ false, 'false', 'FALSE', '0', 0, 'f', 'F' ].each do |value|
       it "returns false when value is #{value.inspect}" do
-        property.typecast(value).should be(false)
+        expect(property.typecast(value)).to be(false)
       end
     end
 
     [ 'string', 2, 1.0, BigDecimal('1.0'), DateTime.now, Time.now, Date.today, Class, Object.new, ].each do |value|
       it "does not typecast value #{value.inspect}" do
-        property.typecast(value).should equal(value)
+        expect(property.typecast(value)).to equal(value)
       end
     end
   end

data/spec/semipublic/property/class_spec.rb

@@ -22,15 +22,15 @@ describe Ardm::Property::Class do
 
   describe '#typecast' do
     it 'returns same value if a class' do
-      property.typecast(model).should equal(model)
+      expect(property.typecast(model)).to equal(model)
     end
 
     it 'returns the class if found' do
-      property.typecast(model.name).should eql(model)
+      expect(property.typecast(model.name)).to eql(model)
     end
 
     it 'does not typecast non-class values' do
-      property.typecast('NoClass').should eql('NoClass')
+      expect(property.typecast('NoClass')).to eql('NoClass')
     end
   end
 end

data/spec/semipublic/property/date_spec.rb

@@ -21,24 +21,24 @@ describe Ardm::Property::Date do
           :day   => '25'
         )
 
-        result.should be_kind_of(Date)
-        result.year.should eql(2007)
-        result.month.should eql(3)
-        result.day.should eql(25)
+        expect(result).to be_kind_of(Date)
+        expect(result.year).to eql(2007)
+        expect(result.month).to eql(3)
+        expect(result.day).to eql(25)
       end
     end
 
     describe 'and value is a string' do
       it 'parses the string' do
         result = property.typecast('Dec 20th, 2006')
-        result.month.should == 12
-        result.day.should == 20
-        result.year.should == 2006
+        expect(result.month).to eq(12)
+        expect(result.day).to eq(20)
+        expect(result.year).to eq(2006)
       end
     end
 
     it 'does not typecast non-date values' do
-      property.typecast('not-date').should eql('not-date')
+      expect(property.typecast('not-date')).to eql('not-date')
     end
   end
 end

data/spec/semipublic/property/date_time_spec.rb

@@ -24,24 +24,24 @@ describe Ardm::Property::DateTime do
           :sec   => '0'
         )
 
-        result.should be_kind_of(DateTime)
-        result.year.should eql(2006)
-        result.month.should eql(11)
-        result.day.should eql(23)
-        result.hour.should eql(12)
-        result.min.should eql(0)
-        result.sec.should eql(0)
+        expect(result).to be_kind_of(DateTime)
+        expect(result.year).to eql(2006)
+        expect(result.month).to eql(11)
+        expect(result.day).to eql(23)
+        expect(result.hour).to eql(12)
+        expect(result.min).to eql(0)
+        expect(result.sec).to eql(0)
       end
     end
 
     describe 'and value is a string' do
       it 'parses the string' do
-        property.typecast('Dec, 2006').month.should == 12
+        expect(property.typecast('Dec, 2006').month).to eq(12)
       end
     end
 
     it 'does not typecast non-datetime values' do
-      property.typecast('not-datetime').should eql('not-datetime')
+      expect(property.typecast('not-datetime')).to eql('not-datetime')
     end
   end
 end

data/spec/semipublic/property/decimal_spec.rb

@@ -15,68 +15,68 @@ describe Ardm::Property::Decimal do
   describe '#typecast' do
     it 'returns same value if a decimal' do
       @value = BigDecimal('24.0')
-      property.typecast(@value).should equal(@value)
+      expect(property.typecast(@value)).to equal(@value)
     end
 
     it 'returns decimal representation of a zero string integer' do
-      property.typecast('0').should eql(BigDecimal('0.0'))
+      expect(property.typecast('0')).to eql(BigDecimal('0.0'))
     end
 
     it 'returns decimal representation of a positive string integer' do
-      property.typecast('24').should eql(BigDecimal('24.0'))
+      expect(property.typecast('24')).to eql(BigDecimal('24.0'))
     end
 
     it 'returns decimal representation of a negative string integer' do
-      property.typecast('-24').should eql(BigDecimal('-24.0'))
+      expect(property.typecast('-24')).to eql(BigDecimal('-24.0'))
     end
 
     it 'returns decimal representation of a zero string float' do
-      property.typecast('0.0').should eql(BigDecimal('0.0'))
+      expect(property.typecast('0.0')).to eql(BigDecimal('0.0'))
     end
 
     it 'returns decimal representation of a positive string float' do
-      property.typecast('24.35').should eql(BigDecimal('24.35'))
+      expect(property.typecast('24.35')).to eql(BigDecimal('24.35'))
     end
 
     it 'returns decimal representation of a negative string float' do
-      property.typecast('-24.35').should eql(BigDecimal('-24.35'))
+      expect(property.typecast('-24.35')).to eql(BigDecimal('-24.35'))
     end
 
     it 'returns decimal representation of a zero string float, with no leading digits' do
-      property.typecast('.0').should eql(BigDecimal('0.0'))
+      expect(property.typecast('.0')).to eql(BigDecimal('0.0'))
     end
 
     it 'returns decimal representation of a positive string float, with no leading digits' do
-      property.typecast('.41').should eql(BigDecimal('0.41'))
+      expect(property.typecast('.41')).to eql(BigDecimal('0.41'))
     end
 
     it 'returns decimal representation of a zero integer' do
-      property.typecast(0).should eql(BigDecimal('0.0'))
+      expect(property.typecast(0)).to eql(BigDecimal('0.0'))
     end
 
     it 'returns decimal representation of a positive integer' do
-      property.typecast(24).should eql(BigDecimal('24.0'))
+      expect(property.typecast(24)).to eql(BigDecimal('24.0'))
     end
 
     it 'returns decimal representation of a negative integer' do
-      property.typecast(-24).should eql(BigDecimal('-24.0'))
+      expect(property.typecast(-24)).to eql(BigDecimal('-24.0'))
     end
 
     it 'returns decimal representation of a zero float' do
-      property.typecast(0.0).should eql(BigDecimal('0.0'))
+      expect(property.typecast(0.0)).to eql(BigDecimal('0.0'))
     end
 
     it 'returns decimal representation of a positive float' do
-      property.typecast(24.35).should eql(BigDecimal('24.35'))
+      expect(property.typecast(24.35)).to eql(BigDecimal('24.35'))
     end
 
     it 'returns decimal representation of a negative float' do
-      property.typecast(-24.35).should eql(BigDecimal('-24.35'))
+      expect(property.typecast(-24.35)).to eql(BigDecimal('-24.35'))
     end
 
     [ Object.new, true, '0.', '-.0', 'string' ].each do |value|
       it "does not typecast non-numeric value #{value.inspect}" do
-        property.typecast(value).should equal(value)
+        expect(property.typecast(value)).to equal(value)
       end
     end
   end

data/spec/semipublic/property/float_spec.rb

@@ -15,68 +15,68 @@ describe Ardm::Property::Float do
   describe '#typecast' do
     it 'returns same value if a float' do
       value = 24.0
-      property.typecast(value).should equal(value)
+      expect(property.typecast(value)).to equal(value)
     end
 
     it 'returns float representation of a zero string integer' do
-      property.typecast('0').should eql(0.0)
+      expect(property.typecast('0')).to eql(0.0)
     end
 
     it 'returns float representation of a positive string integer' do
-      property.typecast('24').should eql(24.0)
+      expect(property.typecast('24')).to eql(24.0)
     end
 
     it 'returns float representation of a negative string integer' do
-      property.typecast('-24').should eql(-24.0)
+      expect(property.typecast('-24')).to eql(-24.0)
     end
 
     it 'returns float representation of a zero string float' do
-      property.typecast('0.0').should eql(0.0)
+      expect(property.typecast('0.0')).to eql(0.0)
     end
 
     it 'returns float representation of a positive string float' do
-      property.typecast('24.35').should eql(24.35)
+      expect(property.typecast('24.35')).to eql(24.35)
     end
 
     it 'returns float representation of a negative string float' do
-      property.typecast('-24.35').should eql(-24.35)
+      expect(property.typecast('-24.35')).to eql(-24.35)
     end
 
     it 'returns float representation of a zero string float, with no leading digits' do
-      property.typecast('.0').should eql(0.0)
+      expect(property.typecast('.0')).to eql(0.0)
     end
 
     it 'returns float representation of a positive string float, with no leading digits' do
-      property.typecast('.41').should eql(0.41)
+      expect(property.typecast('.41')).to eql(0.41)
     end
 
     it 'returns float representation of a zero integer' do
-      property.typecast(0).should eql(0.0)
+      expect(property.typecast(0)).to eql(0.0)
     end
 
     it 'returns float representation of a positive integer' do
-      property.typecast(24).should eql(24.0)
+      expect(property.typecast(24)).to eql(24.0)
     end
 
     it 'returns float representation of a negative integer' do
-      property.typecast(-24).should eql(-24.0)
+      expect(property.typecast(-24)).to eql(-24.0)
     end
 
     it 'returns float representation of a zero decimal' do
-      property.typecast(BigDecimal('0.0')).should eql(0.0)
+      expect(property.typecast(BigDecimal('0.0'))).to eql(0.0)
     end
 
     it 'returns float representation of a positive decimal' do
-      property.typecast(BigDecimal('24.35')).should eql(24.35)
+      expect(property.typecast(BigDecimal('24.35'))).to eql(24.35)
     end
 
     it 'returns float representation of a negative decimal' do
-      property.typecast(BigDecimal('-24.35')).should eql(-24.35)
+      expect(property.typecast(BigDecimal('-24.35'))).to eql(-24.35)
     end
 
     [ Object.new, true, '0.', '-.0', 'string' ].each do |value|
       it "does not typecast non-numeric value #{value.inspect}" do
-        property.typecast(value).should equal(value)
+        expect(property.typecast(value)).to equal(value)
       end
     end
   end

data/spec/semipublic/property/integer_spec.rb

@@ -15,68 +15,68 @@ describe Ardm::Property::Integer do
   describe '#typecast' do
     it 'returns same value if an integer' do
       value = 24
-      property.typecast(value).should equal(value)
+      expect(property.typecast(value)).to equal(value)
     end
 
     it 'returns integer representation of a zero string integer' do
-      property.typecast('0').should eql(0)
+      expect(property.typecast('0')).to eql(0)
     end
 
     it 'returns integer representation of a positive string integer' do
-      property.typecast('24').should eql(24)
+      expect(property.typecast('24')).to eql(24)
     end
 
     it 'returns integer representation of a negative string integer' do
-      property.typecast('-24').should eql(-24)
+      expect(property.typecast('-24')).to eql(-24)
     end
 
     it 'returns integer representation of a zero string float' do
-      property.typecast('0.0').should eql(0)
+      expect(property.typecast('0.0')).to eql(0)
     end
 
     it 'returns integer representation of a positive string float' do
-      property.typecast('24.35').should eql(24)
+      expect(property.typecast('24.35')).to eql(24)
     end
 
     it 'returns integer representation of a negative string float' do
-      property.typecast('-24.35').should eql(-24)
+      expect(property.typecast('-24.35')).to eql(-24)
     end
 
     it 'returns integer representation of a zero string float, with no leading digits' do
-      property.typecast('.0').should eql(0)
+      expect(property.typecast('.0')).to eql(0)
     end
 
     it 'returns integer representation of a positive string float, with no leading digits' do
-      property.typecast('.41').should eql(0)
+      expect(property.typecast('.41')).to eql(0)
     end
 
     it 'returns integer representation of a zero float' do
-      property.typecast(0.0).should eql(0)
+      expect(property.typecast(0.0)).to eql(0)
     end
 
     it 'returns integer representation of a positive float' do
-      property.typecast(24.35).should eql(24)
+      expect(property.typecast(24.35)).to eql(24)
     end
 
     it 'returns integer representation of a negative float' do
-      property.typecast(-24.35).should eql(-24)
+      expect(property.typecast(-24.35)).to eql(-24)
     end
 
     it 'returns integer representation of a zero decimal' do
-      property.typecast(BigDecimal('0.0')).should eql(0)
+      expect(property.typecast(BigDecimal('0.0'))).to eql(0)
     end
 
     it 'returns integer representation of a positive decimal' do
-      property.typecast(BigDecimal('24.35')).should eql(24)
+      expect(property.typecast(BigDecimal('24.35'))).to eql(24)
     end
 
     it 'returns integer representation of a negative decimal' do
-      property.typecast(BigDecimal('-24.35')).should eql(-24)
+      expect(property.typecast(BigDecimal('-24.35'))).to eql(-24)
     end
 
     [ Object.new, true, '0.', '-.0', 'string' ].each do |value|
       it "does not typecast non-numeric value #{value.inspect}" do
-        property.typecast(value).should equal(value)
+        expect(property.typecast(value)).to equal(value)
       end
     end
   end