osm 0.0.11 → 0.0.12

data/spec/osm/term_spec.rb

@@ -4,7 +4,17 @@ require 'date'
 
 describe "Term" do
 
-  it "Create" do
+  before :each do
+    @attributes = {
+      :id => 1,
+      :section_id => 2,
+      :name => 'Term name',
+      :start => Date.new(2001, 01, 01),
+      :end => Date.new(2001, 03, 31)
+    }
+  end
+
+  it "Create from API data" do
     data = {
       'termid' => '1',
       'sectionid' => '2',
@@ -12,7 +22,7 @@ describe "Term" do
       'startdate' => '2001-01-01',
       'enddate' => '2001-03-31'
     }
-    term = Osm::Term.new(data)
+    term = Osm::Term.from_api(data)
 
     term.id.should == 1
     term.section_id.should == 2
@@ -23,41 +33,24 @@ describe "Term" do
 
 
   it "Compares two matching terms" do
-    data = {
-      'termid' => '1',
-      'sectionid' => '2',
-      'name' => 'Term name',
-      'startdate' => '2001-01-01',
-      'enddate' => '2001-03-31'
-    }
-    term1 = Osm::Term.new(data)
-    term2 = Osm::Term.new(data)
+    term1 = Osm::Term.new(@attributes)
+    term2 = Osm::Term.new(@attributes)
     term1.should == term2
   end
 
   it "Compares two non-matching terms" do
-    data = {
-      'termid' => '1',
-      'sectionid' => '2',
-      'name' => 'Term name',
-      'startdate' => '2001-01-01',
-      'enddate' => '2001-03-31'
-    }
-    term = Osm::Term.new(data)
+    term = Osm::Term.new(@attributes)
 
-    term.should_not == Osm::Term.new(data.merge('termid' => '3'))
+    term.should_not == Osm::Term.new(@attributes.merge(:id => 3))
   end
 
 
   it "Sorts by Section ID, Start date and then Term ID" do
-    data = {
-      'name' => 'Term name',
-    }
-    term1 = Osm::Term.new(data.merge('sectionid' => '1', 'termid' => '11', 'startdate' => (Date.today - 60).strftime('%Y-%m-%d'), 'enddate' => (Date.today - 1).strftime('%Y-%m-%d')))
-    term2 = Osm::Term.new(data.merge('sectionid' => '1', 'termid' => '12', 'startdate' => (Date.today -  0).strftime('%Y-%m-%d'), 'enddate' => (Date.today + 0).strftime('%Y-%m-%d')))
-    term3 = Osm::Term.new(data.merge('sectionid' => '1', 'termid' => '13', 'startdate' => (Date.today +  1).strftime('%Y-%m-%d'), 'enddate' => (Date.today + 60).strftime('%Y-%m-%d')))
-    term4 = Osm::Term.new(data.merge('sectionid' => '2', 'termid' => '1', 'startdate' => (Date.today +  1).strftime('%Y-%m-%d'), 'enddate' => (Date.today + 60).strftime('%Y-%m-%d')))
-    term5 = Osm::Term.new(data.merge('sectionid' => '2', 'termid' => '2', 'startdate' => (Date.today +  1).strftime('%Y-%m-%d'), 'enddate' => (Date.today + 60).strftime('%Y-%m-%d')))
+    term1 = Osm::Term.new(@attributes.merge(:section_id => 1, :term => 11, :start => (Date.today - 60), :end => (Date.today - 1)))
+    term2 = Osm::Term.new(@attributes.merge(:section_id => 1, :term => 12, :start => (Date.today -  0), :end => (Date.today + 0)))
+    term3 = Osm::Term.new(@attributes.merge(:section_id => 1, :term => 13, :start => (Date.today +  1), :end => (Date.today + 60)))
+    term4 = Osm::Term.new(@attributes.merge(:section_id => 2, :term => 1, :start => (Date.today +  1), :end => (Date.today + 60)))
+    term5 = Osm::Term.new(@attributes.merge(:section_id => 2, :term => 2, :start => (Date.today +  1), :end => (Date.today + 60)))
 
     data = [term5, term3, term2, term4, term1]
     data.sort.should == [term1, term2, term3, term4, term5]
@@ -65,14 +58,9 @@ describe "Term" do
 
 
   it "Works out if it is completly before a date" do
-    data = {
-      'termid' => '1',
-      'sectionid' => '2',
-      'name' => 'Term name',
-    }
-    term1 = Osm::Term.new(data.merge('startdate' => (Date.today - 60).strftime('%Y-%m-%d'), 'enddate' => (Date.today - 1).strftime('%Y-%m-%d')))
-    term2 = Osm::Term.new(data.merge('startdate' => (Date.today -  0).strftime('%Y-%m-%d'), 'enddate' => (Date.today + 0).strftime('%Y-%m-%d')))
-    term3 = Osm::Term.new(data.merge('startdate' => (Date.today +  1).strftime('%Y-%m-%d'), 'enddate' => (Date.today + 60).strftime('%Y-%m-%d')))
+    term1 = Osm::Term.new(@attributes.merge(:start => (Date.today - 60), :end => (Date.today - 1)))
+    term2 = Osm::Term.new(@attributes.merge(:start => (Date.today -  0), :end => (Date.today + 0)))
+    term3 = Osm::Term.new(@attributes.merge(:start => (Date.today +  1), :end => (Date.today + 60)))
 
     term1.before?(Date.today).should == true
     term2.before?(Date.today).should == false
@@ -81,14 +69,9 @@ describe "Term" do
 
 
   it "Works out if it is completly after a date" do
-    data = {
-      'termid' => '1',
-      'sectionid' => '2',
-      'name' => 'Term name',
-    }
-    term1 = Osm::Term.new(data.merge('startdate' => (Date.today - 60).strftime('%Y-%m-%d'), 'enddate' => (Date.today - 1).strftime('%Y-%m-%d')))
-    term2 = Osm::Term.new(data.merge('startdate' => (Date.today -  0).strftime('%Y-%m-%d'), 'enddate' => (Date.today + 0).strftime('%Y-%m-%d')))
-    term3 = Osm::Term.new(data.merge('startdate' => (Date.today +  1).strftime('%Y-%m-%d'), 'enddate' => (Date.today + 60).strftime('%Y-%m-%d')))
+    term1 = Osm::Term.new(@attributes.merge(:start => (Date.today - 60), :end => (Date.today - 1)))
+    term2 = Osm::Term.new(@attributes.merge(:start => (Date.today -  0), :end => (Date.today + 0)))
+    term3 = Osm::Term.new(@attributes.merge(:start => (Date.today +  1), :end => (Date.today + 60)))
 
     term1.after?(Date.today).should == false
     term2.after?(Date.today).should == false
@@ -97,14 +80,9 @@ describe "Term" do
 
 
   it "Works out if it has passed" do
-    data = {
-      'termid' => '1',
-      'sectionid' => '2',
-      'name' => 'Term name',
-    }
-    term1 = Osm::Term.new(data.merge('startdate' => (Date.today - 60).strftime('%Y-%m-%d'), 'enddate' => (Date.today - 1).strftime('%Y-%m-%d')))
-    term2 = Osm::Term.new(data.merge('startdate' => (Date.today -  0).strftime('%Y-%m-%d'), 'enddate' => (Date.today + 0).strftime('%Y-%m-%d')))
-    term3 = Osm::Term.new(data.merge('startdate' => (Date.today +  1).strftime('%Y-%m-%d'), 'enddate' => (Date.today + 60).strftime('%Y-%m-%d')))
+    term1 = Osm::Term.new(@attributes.merge(:start => (Date.today - 60), :end => (Date.today - 1)))
+    term2 = Osm::Term.new(@attributes.merge(:start => (Date.today -  0), :end => (Date.today + 0)))
+    term3 = Osm::Term.new(@attributes.merge(:start => (Date.today +  1), :end => (Date.today + 60)))
 
     term1.past?().should == true
     term2.past?().should == false
@@ -113,14 +91,9 @@ describe "Term" do
 
 
   it "Works out if it is in the future" do
-    data = {
-      'termid' => '1',
-      'sectionid' => '2',
-      'name' => 'Term name',
-    }
-    term1 = Osm::Term.new(data.merge('startdate' => (Date.today - 60).strftime('%Y-%m-%d'), 'enddate' => (Date.today - 1).strftime('%Y-%m-%d')))
-    term2 = Osm::Term.new(data.merge('startdate' => (Date.today -  0).strftime('%Y-%m-%d'), 'enddate' => (Date.today + 0).strftime('%Y-%m-%d')))
-    term3 = Osm::Term.new(data.merge('startdate' => (Date.today +  1).strftime('%Y-%m-%d'), 'enddate' => (Date.today + 60).strftime('%Y-%m-%d')))
+    term1 = Osm::Term.new(@attributes.merge(:start => (Date.today - 60), :end => (Date.today - 1)))
+    term2 = Osm::Term.new(@attributes.merge(:start => (Date.today -  0), :end => (Date.today + 0)))
+    term3 = Osm::Term.new(@attributes.merge(:start => (Date.today +  1), :end => (Date.today + 60)))
 
     term1.future?().should == false
     term2.future?().should == false
@@ -129,14 +102,9 @@ describe "Term" do
 
 
   it "Works out if it is the current term" do
-    data = {
-      'termid' => '1',
-      'sectionid' => '2',
-      'name' => 'Term name',
-    }
-    term1 = Osm::Term.new(data.merge('startdate' => (Date.today - 60).strftime('%Y-%m-%d'), 'enddate' => (Date.today - 1).strftime('%Y-%m-%d')))
-    term2 = Osm::Term.new(data.merge('startdate' => (Date.today -  0).strftime('%Y-%m-%d'), 'enddate' => (Date.today + 0).strftime('%Y-%m-%d')))
-    term3 = Osm::Term.new(data.merge('startdate' => (Date.today +  1).strftime('%Y-%m-%d'), 'enddate' => (Date.today + 60).strftime('%Y-%m-%d')))
+    term1 = Osm::Term.new(@attributes.merge(:start => (Date.today - 60), :end => (Date.today - 1)))
+    term2 = Osm::Term.new(@attributes.merge(:start=> (Date.today -  0), :end => (Date.today + 0)))
+    term3 = Osm::Term.new(@attributes.merge(:start => (Date.today +  1), :end => (Date.today + 60)))
 
     term1.current?().should == false
     term2.current?().should == true
@@ -145,18 +113,13 @@ describe "Term" do
 
 
   it "Works out if it contains a date" do
-    data = {
-      'termid' => '1',
-      'sectionid' => '2',
-      'name' => 'Term name',
-    }
-    term1 = Osm::Term.new(data.merge('startdate' => (Date.today - 60).strftime('%Y-%m-%d'), 'enddate' => (Date.today - 1).strftime('%Y-%m-%d')))
-    term2 = Osm::Term.new(data.merge('startdate' => (Date.today -  0).strftime('%Y-%m-%d'), 'enddate' => (Date.today + 0).strftime('%Y-%m-%d')))
-    term3 = Osm::Term.new(data.merge('startdate' => (Date.today +  1).strftime('%Y-%m-%d'), 'enddate' => (Date.today + 60).strftime('%Y-%m-%d')))
+    term1 = Osm::Term.new(@attributes.merge(:start => (Date.today - 60), :end => (Date.today - 1)))
+    term2 = Osm::Term.new(@attributes.merge(:start => (Date.today -  0), :end => (Date.today + 0)))
+    term3 = Osm::Term.new(@attributes.merge(:start => (Date.today +  1), :end => (Date.today + 60)))
 
     term1.contains_date?(Date.today).should == false
     term2.contains_date?(Date.today).should == true
     term3.contains_date?(Date.today).should == false
   end
 
-end
+end

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-19 00:00:00.000000000Z
+date: 2012-08-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &77301060 !ruby/object:Gem::Requirement
+  requirement: &81262530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *77301060
+  version_requirements: *81262530
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &77300820 !ruby/object:Gem::Requirement
+  requirement: &81262070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77300820
+  version_requirements: *81262070
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &77300570 !ruby/object:Gem::Requirement
+  requirement: &81261520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77300570
+  version_requirements: *81261520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &77300240 !ruby/object:Gem::Requirement
+  requirement: &81261300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77300240
+  version_requirements: *81261300
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &77299890 !ruby/object:Gem::Requirement
+  requirement: &81261040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77299890
+  version_requirements: *81261040
 description: Use the Online Scout Manager API (https://www.onlinescoutmanager.co.uk)
   to retrieve and save data.
 email:
@@ -91,6 +91,8 @@ files:
 - lib/osm/event.rb
 - lib/osm/grouping.rb
 - lib/osm/member.rb
+- lib/osm/register_data.rb
+- lib/osm/register_field.rb
 - lib/osm/role.rb
 - lib/osm/section.rb
 - lib/osm/term.rb
@@ -105,6 +107,8 @@ files:
 - spec/osm/grouping_spec.rb
 - spec/osm/member_spec.rb
 - spec/osm/osm_spec.rb
+- spec/osm/register_data_spec.rb
+- spec/osm/register_field_spec.rb
 - spec/osm/role_spec.rb
 - spec/osm/section_spec.rb
 - spec/osm/term_spec.rb