sitra_client 0.1.0 → 0.2.0

data/lib/sitra_client/sitra_query.rb

@@ -7,7 +7,7 @@ class SitraQuery
 
   def initialize(api_key, site_identifier, criteria = {})
     @apiKey = api_key
-    @siteWebExportIdV1 = site_identifier
+    @projetId = site_identifier
     self.attributes = criteria
   end
 

data/lib/sitra_client/touristic_object.rb

@@ -76,7 +76,7 @@ class TouristicObject
     contact_entries.each do |c|
       if types_ids.include?(c[:type][:id])
         label = c[:type][@libelle]
-        contact_details[label] = c[:coordonnee]
+        contact_details[label] = c[:coordonnees][:fr]
       end
     end
     contact_details
@@ -91,12 +91,12 @@ class TouristicObject
   end
 
   def picture_url(default_url)
-    @imagePrincipale.nil? ? default_url : @imagePrincipale[:traductionFichiers][0][:url]
+    (@illustrations.nil? || @illustrations.empty?) ? default_url : @illustrations[0][:traductionFichiers][0][:url]
   end
 
   def service_provider
-    if @informationsActivite && @informationsActivite[:commerceEtServicePrestataire]
-      @informationsActivite[:commerceEtServicePrestataire][:nom][@libelle]
+    if @informationsActivite && @informationsActivite[:prestataireActivites]
+      @informationsActivite[:prestataireActivites][:nom][@libelle]
     elsif @informationsFeteEtManifestation
       @informationsFeteEtManifestation[:nomLieu]
     else
@@ -105,8 +105,8 @@ class TouristicObject
   end
 
   def address_details
-    if @informationsActivite && @informationsActivite[:commerceEtServicePrestataire]
-      @informationsActivite[:commerceEtServicePrestataire][:adresse]
+    if @informationsActivite && @informationsActivite[:prestataireActivites]
+      @informationsActivite[:prestataireActivites][:adresse]
     else
       @localisation[:adresse]
     end
@@ -284,10 +284,10 @@ class TouristicObject
   end
 
   def parse_geoloc_details
-    if @informationsActivite.nil? || @informationsActivite[:commerceEtServicePrestataire].nil?
+    if @informationsActivite.nil? || @informationsActivite[:prestataireActivites].nil?
       geoloc_details = @localisation[:geolocalisation]
     else
-      geoloc_details = @informationsActivite[:commerceEtServicePrestataire][:geolocalisation]
+      geoloc_details = @informationsActivite[:prestataireActivites][:geolocalisation]
     end
     geoloc_details
   end

data/lib/sitra_client/version.rb

@@ -1,3 +1,3 @@
 module SitraClient
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/sitra_client.rb

@@ -13,7 +13,7 @@ module SitraClient
 
   # Configuration defaults
   @config = {
-      :base_url => 'http://api.sitra-tourisme.com/api/v001',
+      :base_url => 'http://api.sitra-tourisme.com/api/v002',
       :api_key => '',
       :site_identifier => ''
   }

data/test/sitra_client/sitra_query_test.rb

@@ -10,7 +10,7 @@ class SitraQueryTest < Test::Unit::TestCase
 
     query = SitraQuery.new('dummy_key', 'dummy_identifier', {:first_key => 'first_value', :second_key => 'second_value'})
 
-    assert_equal '{"apiKey":"dummy_key","siteWebExportIdV1":"dummy_identifier","first_key":"first_value","second_key":"second_value"}', query.to_params
+    assert_equal '{"apiKey":"dummy_key","projetId":"dummy_identifier","first_key":"first_value","second_key":"second_value"}', query.to_params
   end
 
 end

data/test/sitra_client/touristic_object_test.rb

@@ -32,9 +32,9 @@ class TouristicObjectTest < Test::Unit::TestCase
     hash_result = {
         :informations => {
             :moyensCommunication => [
-                {:type => {:libelleFr => "Téléphone", :id => 201}, :coordonnee => "0123456789"},
-                {:type => {:libelleFr => "Mél", :id => 204}, :coordonnee => "my@email.fr"},
-                {:type => {:libelleFr => "Fax", :id => 202}, :coordonnee => "9876543201"}
+                {:type => {:libelleFr => "Téléphone", :id => 201}, :coordonnees => {:fr => "0123456789"}},
+                {:type => {:libelleFr => "Mél", :id => 204}, :coordonnees => {:fr => "my@email.fr"}},
+                {:type => {:libelleFr => "Fax", :id => 202}, :coordonnees => {:fr => "9876543201"}}
             ]
         }
     }
@@ -44,7 +44,11 @@ class TouristicObjectTest < Test::Unit::TestCase
   end
 
   should 'populate image details' do
-    hash_result = {:imagePrincipale => {:traductionFichiers => [{:url => "my/image/url"}]}}
+    hash_result = {
+        :illustrations => [
+            {:type => "IMAGE", :traductionFichiers => [:url => "my/image/url"]}
+        ]
+    }
     touristic_object = TouristicObject.new(hash_result)
 
     assert_equal 'my/image/url', touristic_object.picture_url('default.png')
@@ -53,7 +57,7 @@ class TouristicObjectTest < Test::Unit::TestCase
   should 'populate address details' do
     hash_result = {
         :informationsActivite => {
-            :commerceEtServicePrestataire => {
+            :prestataireActivites => {
                 :nom => {:libelleFr => "my_service"},
                 :adresse => {:adresse1 => "my_address", :codePostal => "1234", :commune => {:nom => "my_city"}},
                 :geolocalisation => {:valide => true, :geoJson => {:coordinates => [0.1, 0.2]}}
@@ -137,11 +141,11 @@ class TouristicObjectTest < Test::Unit::TestCase
         :type => 'ACTIVITE',
         :informations => {
             :moyensCommunication => [
-                {:type => {:libelleFr => "Téléphone"}, :coordonnee => "0123456789"}
+                {:type => {:libelleFr => "Téléphone"}, :coordonnees => {:fr => "0123456789"}}
             ]
         },
         :informationsActivite => {
-            :commerceEtServicePrestataire => {
+            :prestataireActivites => {
                 :nom => {:libelleFr => "my_service"}
             }
         }
@@ -149,8 +153,8 @@ class TouristicObjectTest < Test::Unit::TestCase
 
     touristic_object = TouristicObject.new(hash_result)
 
-    assert_equal "0123456789", touristic_object.information[:moyensCommunication][0][:coordonnee]
-    assert_equal "my_service", touristic_object.information[:commerceEtServicePrestataire][:nom][:libelleFr]
+    assert_equal "0123456789", touristic_object.information[:moyensCommunication][0][:coordonnees][:fr]
+    assert_equal "my_service", touristic_object.information[:prestataireActivites][:nom][:libelleFr]
   end
 
   should 'default to fr locale' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sitra_client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-14 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler