dagjeweg 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1886e6023a84dfc6a33cf9443bc27b31371478f3
-  data.tar.gz: fae38479a20d045689dfe443bd032c024177eae7
+  metadata.gz: 007900558d35b96a46cd77cb23cb574312952c6e
+  data.tar.gz: edf7614d10a036f90ba0dc92cbbc67872be18e83
 SHA512:
-  metadata.gz: 6f16c8e215799861f7c510ad51abe11ca453be42f79dfab2f0715228c599b2a3e1413adbbcf087499de6ae6fe7de61dba89e3ee2565bb028275061012a6ad352
-  data.tar.gz: fb1c25667e1a82401e1ea2fb4861044e355cac011954406e8f40cf39add0acfc7f21e66405eb7f36be024d5d670d1ce3e164ed56c91dce313ca33525bee04470
+  metadata.gz: 2f8dc4aa290e1cace6153e6cd0095f0a4277f9145cdf4f28db86ab0a788cfe92037e313866276d1e7d8a3839f1f9f739e72edd4e460b731525da88d17b30d2bd
+  data.tar.gz: b286a44ae8e67c40bda9e8c7a01f49560e36b396db2f7db3deea051cc6d84c4de03f97fe8395393bec887efdfaa92810bd72f6c2da5bdd20b03ba8c6b463a0aa

data/README.md

@@ -20,6 +20,14 @@ Of installeer het zelf:
 
     $ gem install dagjeweg
 
+## Configuratie in Rails applicatie
+Pas de configuratie van de environment aan (development.rb, production.rb, etc.)
+
+```ruby
+config.dagjeweg.api_key   = "voerhierjouwmd5apikeyin"
+```
+
+
 ## Gebruik
 
 Mogelijkheden:
@@ -82,7 +90,7 @@ De volgende velden kunnen worden opgevraagd van iedere tip:
 	@tips.first.nearby(5)
 
 	# Vraag reviews van een uitstapje op
-	@reviews = DagjeWeg::Tip.find(22).reviews
+	@reviews = Dagjeweg::Tip.find(22).reviews
 ```
 
 ## API Key

data/lib/dagjeweg/engine.rb

@@ -8,6 +8,6 @@ module DagjeWeg
   # config.dagjeweg.api_key  = "12343465sdfgsadr324"
   #
   class Engine < Rails::Engine
-    config.dagjeweg = Docdata::Config
+    config.dagjeweg = Dagjeweg::Config
   end
 end

data/lib/dagjeweg/tip.rb

@@ -13,23 +13,20 @@ module Dagjeweg
       args.each do |k,v|
         instance_variable_set("@#{k}", v) unless v.nil?
       end
-      self.distance = distance.to_f unless distance == ''
-      self.price = price.to_i unless price == ''
-      self.price_kids = price_kids.to_i unless price_kids == ''
-      self.price_toddlers = price_toddlers.to_i unless price_toddlers == ''
-      self.price_seniors = price_seniors.to_i unless price_seniors == ''
+      typecast_attrs
     end
 
+
     # returns a list of tips for given query
     def self.search(query="", per_page=50, page=1)
-      @search_tips ||= []
-      unless @search_tips.any?
+      search_tips = []
+      unless search_tips.any?
         uri = Dagjeweg::Tip.api_url("search.json?q=#{query}&per_page=#{per_page}&page=#{page}")
         json = Dagjeweg::Tip.get_json(uri)
         for object in json
-          @search_tips << Dagjeweg::Tip.new(object)
+          search_tips << Dagjeweg::Tip.new(object)
         end
-        return @search_tips
+        return search_tips
       end
     end
 
@@ -51,38 +48,22 @@ module Dagjeweg
     def self.near(lat, lon, per_page)
       uri = Dagjeweg::Tip.api_url("tips.json?lat=#{lat}&lon=#{lon}&per_page=#{per_page}")
       json = Dagjeweg::Tip.get_json(uri)
-      if json && json.any?
-        a = []
-        for object in json
-          a << Dagjeweg::Tip.new(json.first)
-        end
-        return a
-      else
-        raise DagjewegError.new("Tip met deze ID werd niet gevonden.")
-      end
+      Dagjeweg::Tip.parse_json(json)
     end
 
     # returns a list of tips in the range of x kilometers of this instance
     def nearby(range=10)
       uri = Dagjeweg::Tip.api_url("nearby.json?id=#{id.to_s}")
       json = Dagjeweg::Tip.get_json(uri)
-      if json && json.any?
-        a = []
-        for object in json
-          a << Dagjeweg::Tip.new(json.first)
-        end
-        return a
-      else
-        raise DagjewegError.new("Tip met deze ID werd niet gevonden.")
-      end
+      Dagjeweg::Tip.parse_json(json)
     end
 
     # returns a list of review objects
     def reviews
-      @reviews ||= []
-      unless @reviews.any?
+      reviews = []
+      unless reviews.any?
         for object in show_reviews
-          @reviews << Dagjeweg::Review.new(
+          reviews << Dagjeweg::Review.new(
             tip_id: id, 
             reviewer: object["reviewer"], 
             title: object["title"],
@@ -94,7 +75,7 @@ module Dagjeweg
           )
         end
       end
-      return @reviews
+      return reviews
     end
 
     # returns the DagjeWeg ID
@@ -113,18 +94,26 @@ module Dagjeweg
     
     private
 
+    # Transform the json object in an Array of Tip instances
+    def self.parse_json(json)
+      a = []
+      for object in json
+        a << Dagjeweg::Tip.new(json.first)
+      end
+      return a
+    end
+
+    # Get the JSON object and return proper errors in scenarios where response code != 200 OK
     def self.get_json(uri)
       resp = Net::HTTP.get_response(URI.parse(uri))
-      if resp.code.to_i == 200
-        buffer = resp.body
-        result = JSON.parse(buffer)
-        return result
-      elsif resp.code.to_i == 404
+      case resp.code.to_i
+      when 200
+        return JSON.parse(resp.body)
+      when 404
         raise DagjewegError.new(self), "Tip met deze ID werd niet gevonden. (#{resp.code})"
-      elsif resp.code.to_i == 403
+      when 403
         raise DagjewegError.new(self), "Ongeldige API Key (#{resp.code})"
       else
-        puts resp
         raise DagjewegError.new(self), "Onbekende fout (#{resp.code})"
       end
     end
@@ -137,5 +126,13 @@ module Dagjeweg
       "http://m.dagjeweg.nl/api/#{Config.api_key}/"
     end
 
+    def typecast_attrs
+      self.distance = distance.to_f unless distance == ''
+      self.price = price.to_i unless price == ''
+      self.price_kids = price_kids.to_i unless price_kids == ''
+      self.price_toddlers = price_toddlers.to_i unless price_toddlers == ''
+      self.price_seniors = price_seniors.to_i unless price_seniors == ''
+    end
+
   end
 end

data/lib/dagjeweg/version.rb

@@ -1,3 +1,3 @@
 module Dagjeweg
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

data/spec/tip_spec.rb

@@ -95,7 +95,6 @@ describe Dagjeweg::Tip do
 	  	end
 	 
 	    it "returns a list of reviews for a tip" do
-	    	puts @tip.inspect
 	    	expect(@tip.reviews.count).to be > 20
 	    end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dagjeweg
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Henk Meijer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake