solo-rails 0.1.2 → 0.1.3

data/lib/solo-rails.rb

@@ -232,20 +232,33 @@ class SoloRails
     end
 
     # attempts to make ruby Date or failsover to string from SOLO complex date field - PG 2011-04-08
+    # always returns a string now to attempt manage partial dates better - PG 2013-01-30
     def self.parse_complex_date(element)
       d = element.text.split("-")
-      date = []
-      date << "%02d" % d[2] unless d[2].nil?
-      date << "%02d" % d[1] unless d[1].nil?
-      date << d[0] unless d[0].nil?
+      # date = []
+      # date << "%02d" % d[2] unless d[2].nil?
+      # date << "%02d" % d[1] unless d[1].nil?
+      # date << d[0] unless d[0].nil?
+
+      year = "%02d" % d[0] unless d[0].nil?
+      month = "%02d" % d[1] unless d[1].nil?
+      day = d[2] unless d[2].nil?
+
       circa = "circa " if element.attribute("circa").to_s == "1"
       nodate = "forthcoming " if element.attribute("nodate").to_s == "1"
-      ongoing = "ongoing" if element.attribute("ongoing").to_s == "1" 
-      begin
-        ret = Date.parse("#{date[0]}-#{date[1]}-#{date[2]}")
-      rescue
-        ret = "#{circa}#{nodate}#{date.join("-")} #{ongoing}".capitalize
-      end
+      ongoing = " ongoing" if element.attribute("ongoing").to_s == "1" 
+      # begin
+        # ret = Date.parse("#{date[0]}-#{date[1]}-#{date[2]}")
+        if year.present? && month.present? && day.present?
+          date = Chronic.parse("#{year}-#{month.capitalize}-#{day}").strftime('%d %B %Y')
+        elsif year.present? && month.present? && day.nil?
+          date = Chronic.parse("#{year}-#{month.capitalize}-15").strftime('%B %Y')
+        elsif year.present? && month.nil? && day.nil?
+          date = Chronic.parse("#{year}-06-01").strftime('%Y')
+        end
+      # rescue
+        ret = "#{circa}#{nodate}#{date}#{ongoing}"
+      # end
       ret
     end
 

data/lib/solo-rails/version.rb

@@ -1,5 +1,5 @@
 module Solo
   module Rails
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solo-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000 Z
+date: 2013-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70340978044160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70340978044160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70340978043060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70340978043060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &70340978056320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70340978056320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rinku
-  requirement: &70340978054940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70340978054940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides methods to query Soutron Solo catalog from Ruby
 email:
 - github@modagoo.co.uk
@@ -89,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: solo-rails
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper for Soutron Solo API