sitra_client 0.0.7 → 0.0.8

data/.gitignore

@@ -1,17 +1,17 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in sitra_client.gemspec
-gemspec
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in sitra_client.gemspec
+gemspec

data/LICENSE.txt

@@ -1,22 +1,22 @@
-Copyright (c) 2014 jeanbaptistevilain
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2014 jeanbaptistevilain
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,29 +1,29 @@
-# SitraClient
-
-TODO: Write a gem description
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'sitra_client'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install sitra_client
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+# SitraClient
+
+TODO: Write a gem description
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'sitra_client'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install sitra_client
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Rakefile

@@ -1,7 +1,7 @@
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-
-Rake::TestTask.new do |t|
-  t.verbose = true
-  t.pattern = '**/*_test.rb'
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.verbose = true
+  t.pattern = '**/*_test.rb'
 end

data/lib/sitra_client/touristic_object.rb

@@ -108,7 +108,9 @@ class TouristicObject
   end
 
   def address
-    "#{address_details[:adresse1]}, #{address_details[:commune][:nom]}"
+    computed_address = ''
+    computed_address += "#{address_details[:adresse1]}, " unless address_details[:adresse1].nil?
+    computed_address + address_details[:commune][:nom]
   end
 
   def latitude
@@ -145,8 +147,8 @@ class TouristicObject
     eligible_populations.uniq
   end
 
-  def adapted_tourism
-    @prestations && @prestations[:tourismesAdaptes] && @prestations[:tourismesAdaptes].collect {|t| t[@libelle]}
+  def prestations(prestation_type)
+    @prestations && @prestations[prestation_type] && @prestations[prestation_type].collect {|t| t[@libelle]}
   end
 
   def environments
@@ -157,14 +159,6 @@ class TouristicObject
     @presentation && @presentation[:typologiesPromoSitra] && @presentation[:typologiesPromoSitra].collect {|t| t[@libelle]}
   end
 
-  def services
-    @prestations && @prestations[:services] && @prestations[:services].collect {|t| t[@libelle]}
-  end
-
-  def equipements
-    @prestations && @prestations[:equipements] && @prestations[:equipements].collect {|t| t[@libelle]}
-  end
-
   private
 
   def parse_geoloc_details

data/lib/sitra_client/version.rb

@@ -1,3 +1,3 @@
 module SitraClient
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/sitra_client.rb

@@ -1,65 +1,65 @@
-require 'sitra_client/version'
-require 'sitra_client/sitra_query'
-require 'sitra_client/sitra_response'
-require 'open-uri'
-require 'logger'
-
-module SitraClient
-
-  MAX_COUNT = 100
-
-  # Safety net
-  MAX_LOOPS = 5
-
-  # Configuration defaults
-  @config = {
-      :base_url => 'http://api.sitra-tourisme.com/api/v001',
-      :api_key => '',
-      :site_identifier => ''
-  }
-
-  @valid_config_keys = @config.keys
-  @logger = Logger.new(STDOUT)
-
-  # Configure through hash
-  def self.configure(opts = {})
-    opts.each {|k,v| @config[k.to_sym] = v if @valid_config_keys.include? k.to_sym}
-  end
-
-  def self.config
-    @config
-  end
-
-  def self.query(criteria, all_results = false)
-    if all_results
-      loops = 0
-      criteria[:first] = 0
-      criteria[:count] = MAX_COUNT
-      response = get_response(criteria)
-      results = response.as_array
-      while response.results_count > results.length && loops < MAX_LOOPS
-        loops += 1
-        criteria[:first] += MAX_COUNT
-        results += get_response(criteria).as_array
-      end
-    else
-      response = get_response(criteria)
-      results = response.as_array
-    end
-    results
-  end
-
-  private
-
-  def self.get_response(criteria)
-    response = SitraResponse.new
-    query = SitraQuery.new(@config[:api_key], @config[:site_identifier], criteria)
-    @logger.info "Search query : #{@config[:base_url]}/recherche/list-objets-touristiques?query=#{query.to_params}"
-    open("#{@config[:base_url]}/recherche/list-objets-touristiques?query=#{CGI.escape query.to_params}") { |f|
-      f.each_line {|line| response.append_line(line)}
-    }
-    @logger.info "Retrieved #{response.returned_count} of #{response.results_count} results"
-    response
-  end
-
-end
+require 'sitra_client/version'
+require 'sitra_client/sitra_query'
+require 'sitra_client/sitra_response'
+require 'open-uri'
+require 'logger'
+
+module SitraClient
+
+  MAX_COUNT = 100
+
+  # Safety net
+  MAX_LOOPS = 5
+
+  # Configuration defaults
+  @config = {
+      :base_url => 'http://api.sitra-tourisme.com/api/v001',
+      :api_key => '',
+      :site_identifier => ''
+  }
+
+  @valid_config_keys = @config.keys
+  @logger = Logger.new(STDOUT)
+
+  # Configure through hash
+  def self.configure(opts = {})
+    opts.each {|k,v| @config[k.to_sym] = v if @valid_config_keys.include? k.to_sym}
+  end
+
+  def self.config
+    @config
+  end
+
+  def self.query(criteria, all_results = false)
+    if all_results
+      loops = 0
+      criteria[:first] = 0
+      criteria[:count] = MAX_COUNT
+      response = get_response(criteria)
+      results = response.as_array
+      while response.results_count > results.length && loops < MAX_LOOPS
+        loops += 1
+        criteria[:first] += MAX_COUNT
+        results += get_response(criteria).as_array
+      end
+    else
+      response = get_response(criteria)
+      results = response.as_array
+    end
+    results
+  end
+
+  private
+
+  def self.get_response(criteria)
+    response = SitraResponse.new
+    query = SitraQuery.new(@config[:api_key], @config[:site_identifier], criteria)
+    @logger.info "Search query : #{@config[:base_url]}/recherche/list-objets-touristiques?query=#{query.to_params}"
+    open("#{@config[:base_url]}/recherche/list-objets-touristiques?query=#{CGI.escape query.to_params}") { |f|
+      f.each_line {|line| response.append_line(line)}
+    }
+    @logger.info "Retrieved #{response.returned_count} of #{response.results_count} results"
+    response
+  end
+
+end

data/sitra_client.gemspec

@@ -1,27 +1,27 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'sitra_client/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "sitra_client"
-  spec.version       = SitraClient::VERSION
-  spec.authors       = ["jeanbaptistevilain"]
-  spec.email         = ["jbvilain@gmail.com"]
-  spec.description   = "Sitra Client Gem"
-  spec.summary       = "A simple Ruby wrapper for the SITRA JSON api"
-  spec.homepage      = "https://github.com/jeanbaptistevilain/sitra_client"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.0"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "test-unit"
-  spec.add_development_dependency "shoulda"
-  spec.add_runtime_dependency "rails", "~> 3.2.14"
-  spec.add_runtime_dependency "json"
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'sitra_client/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "sitra_client"
+  spec.version       = SitraClient::VERSION
+  spec.authors       = ["jeanbaptistevilain"]
+  spec.email         = ["jbvilain@gmail.com"]
+  spec.description   = "Sitra Client Gem"
+  spec.summary       = "A simple Ruby wrapper for the SITRA JSON api"
+  spec.homepage      = "https://github.com/jeanbaptistevilain/sitra_client"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.0"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "test-unit"
+  spec.add_development_dependency "shoulda"
+  spec.add_runtime_dependency "rails", "~> 3.2.14"
+  spec.add_runtime_dependency "json"
+end

data/test/sitra_client/touristic_object_test.rb

@@ -125,11 +125,11 @@ class TouristicObjectTest < Test::Unit::TestCase
     assert_equal ['Familles'], touristic_object.population
   end
 
-  should 'populate adapted tourism fields' do
+  should 'populate prestations fields' do
     hash_result = {:prestations => {:tourismesAdaptes => [{:libelleFr => "Accessible en fauteuil roulant en autonomie"}]}}
     touristic_object = TouristicObject.new(hash_result)
 
-    assert_true touristic_object.adapted_tourism.include?('Accessible en fauteuil roulant en autonomie')
+    assert_true touristic_object.prestations(:tourismesAdaptes).include?('Accessible en fauteuil roulant en autonomie')
   end
 
   should 'retrieve merged general and specific information' do
@@ -167,4 +167,8 @@ class TouristicObjectTest < Test::Unit::TestCase
 
     assert_equal 'my_description_en', touristic_object.description
   end
+
+  should 'populate services data' do
+
+  end
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: sitra_client
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
+  prerelease: 
 platform: ruby
 authors:
 - jeanbaptistevilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -119,26 +132,27 @@ files:
 homepage: https://github.com/jeanbaptistevilain/sitra_client
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A simple Ruby wrapper for the SITRA JSON api
 test_files:
 - test/sitra_client/sitra_query_test.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjljNjU4NmJlODE1NWUyNjU3MDdlMTQ4YmVhZGYzZGU3Y2FlNDZmZA==
-  data.tar.gz: !binary |-
-    YzAxZWUzYWFhNjIxZWVmNjQxZjc2NjRiOGQ2MDQ5YmZkMDc0YTQ0ZA==
-SHA512:
-  metadata.gz: !binary |-
-    YjBjMWI2M2M3MzNiZWY5OTFlNTNjNzAzMmY3ZGNiZmY0OGVlYjc1YWJlZmVj
-    NDk3Y2NkY2ZkY2M4ZThiYzE1OTYzMGVjMGZhMWVlYWViMjFjMDdiNzcwZWQw
-    MDIyZDk0ZTEzYTM0NDJiNWFhYzNmMWNmYzU0YWU2YWIyYzFlZjE=
-  data.tar.gz: !binary |-
-    MzBlYmIzYmI0NTMyMjhjMjFhOTQ1MmY1MmE4MjU5ZmU2YjFiNDBhN2RlODM0
-    MjM4YmRiMzc1NTUxMzhlYTY0YTFhY2U3MzFlNDFkNGFkYzgxOTE0ZjE0OTc2
-    MjcwYmIzZDg5NzZlN2FiYzEyNzM4ODhmNGRkN2Q0NGQxOWI5OGM=