lhs 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 911fecf1a1b1e1d5a011b185b4d6ba8fb63f7445
-  data.tar.gz: 24b82515d4cfe87227d949afe0cd23048962bce7
+  metadata.gz: 4429a4da605c0b11565e5e005771dd9be52411a3
+  data.tar.gz: 5071611c0b36c7162ad4aac13172dba6d4c86f67
 SHA512:
-  metadata.gz: 43a4a6f1605313a18ce9f26e00aafa80e11530d99c2f52e3fab6bf26fd40a4e249af9ab87f854e76a4b335df26940deb27e1a5ad8bbdc39481bb9a0aa80ca46e
-  data.tar.gz: 66e736a905f730e2216fe676051f16436437c45e7ca1f393c0169e13204d511b3f44f3d8c2b66ef66f5fbd9024cf7046fd13f0dbd7920213538667ee13948bd4
+  metadata.gz: 3c52dcb465ba7b0a881811fc3d71eb83140c5057872aa30c3c83004cce75e392c9bd47abffa201d8201e3116aa6dfa359c05e890a2d1b66c144b61787de45eb2
+  data.tar.gz: 7ff5aa130cfb6fffcf07a8651b07b6ea82bf48ff8927f1a9015c5ededed930dcf07a6e8372a035f339e549da6eca8551fa92bbfabf95825f483d905abfbc940a

data/lib/lhs/collection.rb

@@ -5,24 +5,24 @@ require File.join(__dir__, 'proxy.rb')
 class LHS::Collection < LHS::Proxy
 
   def total
-    _data._raw['total']
+    _data._raw[:total]
   end
 
   def limit
-    _data._raw['limit']
+    _data._raw[:limit]
   end
 
   def offset
-    _data._raw['offset']
+    _data._raw[:offset]
   end
 
   def href
-    _data._raw['href']
+    _data._raw[:href]
   end
 
   def _collection
     raw = _data._raw if _data._raw.is_a?(Array)
-    raw ||= _data._raw['items']
+    raw ||= _data._raw[:items]
     Collection.new(raw, _data, _data._service)
   end
 

data/lib/lhs/concerns/item/validation.rb

@@ -9,11 +9,12 @@ class LHS::Item < LHS::Proxy
       self.errors = nil
       fail 'No validation endpoint found!' unless validation_endpoint
       service = LHS::Service.for_url(validation_endpoint.url)
+      params = validation_endpoint.options.fetch(:params, {}).merge(persist: false)
       begin
         service.request(
           url: validation_endpoint.url,
           method: :post,
-          params: validation_endpoint.options.fetch(:params, {}).merge(persist: false),
+          params: params,
           body: _data.to_json,
           headers: {'Content-Type' => 'application/json'}
         )

data/lib/lhs/concerns/service/all.rb

@@ -16,14 +16,14 @@ class LHS::Service
         all = []
         default_max_limit = 100
         data = instance.request(params: params.merge(limit: default_max_limit))
-        all.concat(data._raw['items'])
-        total_left = data._raw['total'] - data.count
-        limit = data._raw['limit'] || data.count
+        all.concat(data._raw[:items])
+        total_left = data._raw[:total] - data.count
+        limit = data._raw[:limit] || data.count
         if limit > 0
           requests = total_left / limit
           requests.times do |i|
             offset = limit * (i+1) + 1
-            all.concat instance.request(params: params.merge(limit: limit, offset: offset))._raw['items']
+            all.concat instance.request(params: params.merge(limit: limit, offset: offset))._raw[:items]
           end
         end
         LHS::Data.new(all, nil, self)

data/lib/lhs/concerns/service/batch.rb

@@ -25,8 +25,8 @@ class LHS::Service
         params = options[:params] || {}
         loop do # as suggested by Matz
           data = instance.request(params: params.merge(limit: batch_size, offset: start))
-          batch_size = data._raw['limit']
-          left = data._raw['total'].to_i - data._raw['offset'].to_i - data._raw['limit'].to_i
+          batch_size = data._raw[:limit]
+          left = data._raw[:total].to_i - data._raw[:offset].to_i - data._raw[:limit].to_i
           yield data
           break if left <= 0
           start += batch_size

data/lib/lhs/concerns/service/request.rb

@@ -38,10 +38,10 @@ class LHS::Service
       if data._proxy.is_a? LHS::Collection
         data.each_with_index do |item, i|
           item = item[i] if item.is_a? LHS::Collection
-          item._raw[key.to_s].merge!(addition[i]._raw)
+          item._raw[key.to_sym].merge!(addition[i]._raw)
         end
       elsif data._proxy.is_a? LHS::Item
-        data._raw[key.to_s].merge!(addition._raw)
+        data._raw[key.to_sym].merge!(addition._raw)
       end
     end
 
@@ -108,6 +108,7 @@ class LHS::Service
     def process_options(options)
       options ||= {}
       options = options.dup
+      options[:params].deep_symbolize_keys! if options[:params]
       endpoint = find_endpoint(options[:params])
       options = (endpoint.options || {}).merge(options)
       options[:url] = compute_url!(options[:params]) unless options.key?(:url)

data/lib/lhs/data.rb

@@ -33,6 +33,12 @@ class LHS::Data
     _root._service
   end
 
+  # enforce internal data structure to have deep symbolized keys
+  def _raw=(raw)
+    raw.to_hash.deep_symbolize_keys! if raw && raw.respond_to?(:to_hash)
+    @_raw = raw
+  end
+
   protected
 
   # Use existing mapping to provide data
@@ -53,13 +59,12 @@ class LHS::Data
   private
 
   def collection_proxy?(input)
-    (_raw.is_a?(Hash) && _raw['items']) || 
-      input.is_a?(Array) || _raw.is_a?(Array)
+    !! (input.is_a?(Hash) && input[:items]) || input.is_a?(Array) || _raw.is_a?(Array)
   end
 
   def mapping_for(name)
-    service_instance = LHS::Service.for_url(_raw['href']) if _raw.is_a?(Hash)
-    service_instance ||= _root._service.instance if root_item?
+    service_instance = LHS::Service.for_url(_raw[:href]) if _raw.is_a?(Hash)
+    service_instance ||= _root._service.instance if root_item? && _root._service
     return unless service_instance
     service_instance.mapping[name]
   end
@@ -89,7 +94,7 @@ class LHS::Data
   def proxy_from_input(input)
     if input.is_a? LHS::Proxy
       input
-    elsif collection_proxy?(input)
+    elsif collection_proxy?(raw_from_input(input))
       LHS::Collection.new(self)
     else
       LHS::Item.new(self)
@@ -98,12 +103,13 @@ class LHS::Data
 
   def raw_from_input(input)
     if input.is_a?(String) && input.length > 0
-      JSON.parse(input)
+      JSON.parse(input).deep_symbolize_keys
     elsif defined?(input._raw)
       input._raw
     elsif defined?(input._data)
       input._data._raw
     else
+      input.deep_symbolize_keys! if input.is_a?(Hash)
       input
     end
   end

data/lib/lhs/item.rb

@@ -63,7 +63,7 @@ class LHS::Item < LHS::Proxy
 
   def set(name, value)
     key = name.to_s.gsub(/=$/, '')
-    _data._raw[key] = value
+    _data._raw[key.to_sym] = value
   end
 
   private

data/lib/lhs/proxy.rb

@@ -23,4 +23,5 @@ class LHS::Proxy
     self._loaded = true
     self
   end
+
 end

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/spec/item/internal_data_structure_spec.rb

@@ -0,0 +1,31 @@
+require 'rails_helper'
+
+describe LHS::Item do
+
+  before(:each) do
+    class Feedback < LHS::Service
+      endpoint ':datastore/v2/feedbacks'
+      endpoint ':datastore/v2/feedbacks/:id'
+    end
+  end
+
+  let(:hash) do
+    {'addresses' => [{'businesses' => {'identities' => [{'name' => 'Löwenzorn'}]}}]}
+  end
+
+  let(:data) do
+    LHS::Data.new(hash, nil, Feedback)
+  end
+
+  it 'deep symbolizes keys internaly when new data is initalized' do
+    expect(data._raw[:addresses].first[:businesses][:identities].first[:name]).to eq 'Löwenzorn'
+    data.id = 'YZ12'
+    expect(data._raw.keys).to include(:id)
+  end
+
+  it 'deep symbolizes internal data' do
+    feedback = Feedback.build(hash)
+    expect(feedback._raw.keys).to include(:addresses)
+    expect(feedback._raw[:addresses].first[:businesses][:identities].first[:name]).to eq 'Löwenzorn'
+  end
+end

data/spec/item/setter_spec.rb

@@ -26,7 +26,7 @@ describe LHS::Item do
     it 'sets the value for an existing attribute' do
       expect(item.name = 'Steve').to eq 'Steve'
       expect(item.name).to eq 'Steve'
-      expect(item._raw['name']).to eq 'Steve'
+      expect(item._raw[:name]).to eq 'Steve'
     end
 
     it 'sets things to nil' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - local.ch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc
@@ -215,6 +215,7 @@ files:
 - spec/item/destroy_spec.rb
 - spec/item/errors_spec.rb
 - spec/item/getter_spec.rb
+- spec/item/internal_data_structure_spec.rb
 - spec/item/respond_to_spec.rb
 - spec/item/save_spec.rb
 - spec/item/setter_spec.rb
@@ -327,6 +328,7 @@ test_files:
 - spec/item/destroy_spec.rb
 - spec/item/errors_spec.rb
 - spec/item/getter_spec.rb
+- spec/item/internal_data_structure_spec.rb
 - spec/item/respond_to_spec.rb
 - spec/item/save_spec.rb
 - spec/item/setter_spec.rb