osm 1.2.8 → 1.2.9

data/.travis.yml

@@ -9,4 +9,6 @@ branches:
   only:
     - master
     - staging
+    - /gh(?:\d)+(?:-.+)?/
+    - /dev_ver_\d+\.\d+/
 script: rake ci:travis

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 1.2.9
+
+ * Add osm\_long\_key to badges to make getting badge stock easier
+
 ## Version 1.2.8
 
   * api.get\_user\_permissions now includes the quartermaster permission

data/lib/osm/badge.rb

@@ -9,6 +9,8 @@ module Osm
     #   @return [String] a description of the badge
     # @!attribute [rw] osm_key
     #   @return [String] the key for the badge in OSM
+    # @!attribute [rw] osm_long_key
+    #   @return [String] the long key for the badge in osm (used for getting stock)
     # @!attribute [rw] sections_needed
     #   @return [Fixnum]
     # @!attribute [rw] total_needed
@@ -21,13 +23,14 @@ module Osm
     attribute :name, :type => String
     attribute :requirement_notes, :type => String
     attribute :osm_key, :type => String
+    attribute :osm_long_key, :type => String
     attribute :sections_needed, :type => Integer
     attribute :total_needed, :type => Integer
     attribute :needed_from_section, :type => Object
     attribute :requirements, :type => Object
 
     if ActiveModel::VERSION::MAJOR < 4
-      attr_accessible :name, :requirement_notes, :osm_key, :sections_needed, :total_needed, :needed_from_section, :requirements
+      attr_accessible :name, :requirement_notes, :osm_key, :osm_long_key, :sections_needed, :total_needed, :needed_from_section, :requirements
     end
 
     validates_numericality_of :sections_needed, :only_integer=>true, :greater_than_or_equal_to=>-1
@@ -35,6 +38,7 @@ module Osm
     validates_presence_of :name
     validates_presence_of :requirement_notes
     validates_presence_of :osm_key
+    validates_presence_of :osm_long_key
     validates :needed_from_section, :hash => {:key_type => String, :value_type => Fixnum}
     validates :requirements, :array_of => {:item_type => Osm::Badge::Requirement, :item_valid => true}
 
@@ -77,6 +81,7 @@ module Osm
           :name => detail['name'],
           :requirement_notes => detail['description'],
           :osm_key => detail['shortname'],
+          :osm_long_key => detail['table'],
           :sections_needed => config['sectionsneeded'].to_i,
           :total_needed => config['totalneeded'].to_i,
           :needed_from_section => (config['sections'] || {}).inject({}) { |h,(k,v)| h[k] = v.to_i; h },

data/spec/osm/badge_spec.rb

@@ -8,6 +8,7 @@ describe "Badge" do
       :name => 'name',
       :requirement_notes => 'notes',
       :osm_key => 'key',
+      :osm_long_key => 'long_key',
       :sections_needed => 1,
       :total_needed => 2,
       :needed_from_section => {'a' => 1},
@@ -17,6 +18,7 @@ describe "Badge" do
     badge.name.should == 'name'
     badge.requirement_notes.should == 'notes'
     badge.osm_key.should == 'key'
+    badge.osm_long_key.should == 'long_key'
     badge.sections_needed.should == 1
     badge.total_needed.should == 2
     badge.needed_from_section.should == {'a' => 1}
@@ -415,6 +417,7 @@ describe "Badge" do
         badge.name.should == 'b_name'
         badge.requirement_notes.should == 'b_req_notes'
         badge.osm_key.should == 'badge'
+        badge.osm_long_key.should == 'table'
         badge.sections_needed.should == 1
         badge.total_needed.should == 2
         badge.needed_from_section.should == {'a' => 1}
@@ -437,6 +440,7 @@ describe "Badge" do
         badge.name.should == 'b_name'
         badge.requirement_notes.should == 'b_req_notes'
         badge.osm_key.should == 'badge'
+        badge.osm_long_key.should == 'table'
         badge.sections_needed.should == 1
         badge.total_needed.should == 2
         badge.needed_from_section.should == {'a' => 1}
@@ -459,6 +463,7 @@ describe "Badge" do
         badge.name.should == 'b_name'
         badge.requirement_notes.should == 'b_req_notes'
         badge.osm_key.should == 'badge'
+        badge.osm_long_key.should == 'table'
         badge.sections_needed.should == 1
         badge.total_needed.should == 2
         badge.needed_from_section.should == {'a' => 1}
@@ -481,6 +486,7 @@ describe "Badge" do
         badge.name.should == 'b_name'
         badge.requirement_notes.should == 'b_req_notes'
         badge.osm_key.should == 'badge'
+        badge.osm_long_key.should == 'table'
         badge.sections_needed.should == 1
         badge.total_needed.should == 2
         badge.needed_from_section.should == {'a' => 1}

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "1.2.8"
+  VERSION = "1.2.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport