osm 0.0.24 → 0.0.25

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## Version 0.0.25
+
+  * FlexiRecordData, move these attributes to the fields hash:
+    * first\_name => 'firstname'
+    * last\_name => 'lastname'
+    * age => 'age'
+    * date\_of\_birth => 'dob'
+    * completed => 'completed'
+    * total => 'total'
+
 ## Version 0.0.24
 
   * Make Section::FlexiRecord sortable

data/lib/osm/flexi_record_data.rb

@@ -6,40 +6,20 @@ module Osm
 
     # @!attribute [rw] member_id
     #   @return [Fixnum] OSM id for the member
-    # @!attribute [rw] first_name
-    #   @return [String] Member's first name
-    # @!attribute [rw] last_name
-    #   @return [String] Member's last name
     # @!attribute [rw] grouping__id
     #   @return [Fixnum] OSM id for the grouping the member is in
     # @!attribute [rw] fields
     #   @return [Hash] Keys are the field'd id, values are the field values
-    # @!attribute [rw] total
-    #   @return [Fixnum, nil] The total of the field values, nil if the flexi record does not have this column type
-    # @!attribute [rw] completed
-    #   @return [Fixnum, nil] The count of completed fields, nil if the flexi record does not have this column type
-    # @!attribute [rw] date_of_birth
-    #   @return [Date, nil] The member's date of birth, nil if the flexi record does not have this column type
-    # @!attribute [rw] age
-    #   @return [String, nil] The member's age (yy/mm), nil if the flexi record does not have this column type
 
     attribute :member_id, :type => Integer
-    attribute :first_name, :type => String
-    attribute :last_name, :type => String
     attribute :grouping_id, :type => Integer
-    attribute :date_of_birth, :type => Date
-    attribute :total, :type => Integer
-    attribute :completed, :type => Integer
-    attribute :age, :type => String
     attribute :fields, :default => {}
 
-    attr_accessible :member_id, :first_name, :last_name, :date_of_birth, :grouping_id, :total, :completed, :age, :fields
+    attr_accessible :member_id, :grouping_id, :fields
 
-    validates_presence_of :first_name
-    validates_presence_of :last_name
+    validates_numericality_of :member_id, :only_integer=>true, :greater_than=>0
     validates_numericality_of :grouping_id, :only_integer=>true, :greater_than_or_equal_to=>-2
-    validates_format_of :age, :with => /\A[0-9]{2}\/(0[0-9]|1[012])\Z/, :message => 'age is not in the correct format (yy/mm)', :allow_nil => true
-    validates :fields, :hash => {:key_type => String, :value_type => String}
+    validates :fields, :hash => {:key_type => String}
 
 
     # @!method initialize
@@ -50,16 +30,19 @@ module Osm
     # Initialize a new FlexiRecordData from api data
     # @param [Hash] data the hash of data provided by the API
     def self.from_api(data)
+      data.merge!({
+        'dob' => data['dob'].nil? ? nil : Osm::parse_date(data['dob'], :ignore_epoch => true),
+        'total' => Osm::to_i_or_nil(data['total'].eql?('') ? nil : data['total']),
+        'completed' => Osm::to_i_or_nil(data['completed'].eql?('') ? nil : data['completed']),
+        'age' => data['age'].eql?('') ? nil : data['age'],
+      })
+
       new({
         :member_id => Osm::to_i_or_nil(data['scoutid']),
-        :first_name => data['firstname'],
-        :last_name => data['lastname'],
         :grouping_id => Osm::to_i_or_nil(data['patrolid'].eql?('') ? nil : data['patrolid']),
-        :date_of_birth => data['dob'].nil? ? nil : Osm::parse_date(data['dob'], :ignore_epoch => true),
-        :total => Osm::to_i_or_nil(data['total'].eql?('') ? nil : data['total']),
-        :completed => Osm::to_i_or_nil(data['completed'].eql?('') ? nil : data['completed']),
-        :age => data['age'].eql?('') ? nil : data['age'],
-        :fields => data.select { |key, value| key.to_s.match(/^f_\d+/) }
+        :fields => data.select { |key, value|
+          ['firstname', 'lastname', 'dob', 'total', 'completed', 'age'].include?(key) || key.to_s.match(/^f_\d+/)
+        }
       })
     end
 

data/lib/osm/flexi_record_field.rb

@@ -19,6 +19,7 @@ module Osm
 
     validates_presence_of :id
     validates_presence_of :name
+    validates_inclusion_of :editable, :in => [true, false]
 
 
     # @!method initialize

data/spec/osm/flexi_record_data_spec.rb

@@ -24,13 +24,13 @@ describe "Flexi Record Data" do
 
     rd.member_id.should == 1
     rd.grouping_id.should == 2
-    rd.first_name.should == 'First'
-    rd.last_name.should == 'Last'
-    rd.total.should == 3
-    rd.completed.nil?.should be_true
-    rd.age.nil?.should be_true
-    rd.date_of_birth.should == Date.new(1899, 11, 30)
     rd.fields.should == {
+      'firstname' => 'First',
+      'lastname' => 'Last',
+      'dob' => Date.new(1899, 11, 30),
+      'total' => 3,
+      'completed' => nil,
+      'age' => nil,
       'f_1' => 'a',
       'f_2' => 'b',
     }

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-09-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &71355080 !ruby/object:Gem::Requirement
+  requirement: &83764340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *71355080
+  version_requirements: *83764340
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &71354100 !ruby/object:Gem::Requirement
+  requirement: &83763040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *71354100
+  version_requirements: *83763040
 - !ruby/object:Gem::Dependency
   name: active_attr
-  requirement: &71353110 !ruby/object:Gem::Requirement
+  requirement: &83762650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *71353110
+  version_requirements: *83762650
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &71352230 !ruby/object:Gem::Requirement
+  requirement: &83761810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *71352230
+  version_requirements: *83761810
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &71351620 !ruby/object:Gem::Requirement
+  requirement: &83759370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *71351620
+  version_requirements: *83759370
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &71350940 !ruby/object:Gem::Requirement
+  requirement: &83745000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *71350940
+  version_requirements: *83745000
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &71350120 !ruby/object:Gem::Requirement
+  requirement: &83744610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *71350120
+  version_requirements: *83744610
 description: Use the Online Scout Manager API (https://www.onlinescoutmanager.co.uk)
   to retrieve and save data.
 email: