Skip to content

Commit

Permalink
jruby support.
Browse files Browse the repository at this point in the history
  • Loading branch information
Simon committed Oct 28, 2014
1 parent 48446e8 commit 456fdd5
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 12 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
language: ruby
rvm:
- ruby-2.1.2
- jruby-1.7.16
services:
- redis-server
4 changes: 1 addition & 3 deletions features/support/env.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
require 'active_support/all'
require 'faraday_middleware'
require 'her'
require 'ostruct'
require 'pry'
require 'redis'
require 'hiredis'
require 'jsonpath'
require 'simplecov'
require 'coveralls'
Expand All @@ -28,7 +26,7 @@
I18n.enforce_available_locales = false

Looksist.configure do |looksist|
looksist.lookup_store = Redis.new(url: 'redis://localhost:6379', driver: :hiredis)
looksist.lookup_store = Redis.new(url: 'redis://localhost:6379')
looksist.l2_cache = :no_cache
looksist.driver = Looksist::Serializers::Her
end
2 changes: 1 addition & 1 deletion lib/looksist.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def configure
def bucket_dump(entity)
keys = Looksist.lookup_store.keys("#{entity.pluralize}*")
values = Looksist.redis_service.send("#{entity}_for", keys.collect{|i| i.split('/').last})
(keys.collect {|i| i.split('/').last}).zip(values).to_h
Hash[(keys.collect {|i| i.split('/').last}).zip(values)]
end
end
end
2 changes: 1 addition & 1 deletion lib/looksist/hashed.rb
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def update_using_json_path(hash, opts)
def inject_attributes_for(arry_of_hashes, opts)
entity_name = __entity__(opts[:bucket_name] || opts[:using])
keys = (arry_of_hashes.collect { |i| i[opts[:using]] }).compact.uniq
values = keys.zip(Looksist.redis_service.send("#{entity_name}_for", keys)).to_h
values = Hash[keys.zip(Looksist.redis_service.send("#{entity_name}_for", keys))]
arry_of_hashes.each do |elt|
elt[opts[:populate]] = values[elt[opts[:using]]]
end
Expand Down
2 changes: 1 addition & 1 deletion lib/looksist/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Lookist
VERSION = '0.2.6'
VERSION = '0.2.7'
end
3 changes: 0 additions & 3 deletions looksist.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,8 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'activesupport'
spec.add_development_dependency 'activemodel'
spec.add_development_dependency 'her'
spec.add_development_dependency 'faraday'
spec.add_development_dependency 'faraday_middleware'
spec.add_development_dependency 'cucumber'
spec.add_development_dependency 'redis'
spec.add_development_dependency 'hiredis'
spec.add_development_dependency 'simplecov'
spec.add_development_dependency 'coveralls'

Expand Down
4 changes: 1 addition & 3 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'active_support/all'
require 'faraday_middleware'
require 'her'
require 'faraday'
require 'ostruct'
require 'pry'
require 'simplecov'
Expand Down Expand Up @@ -32,8 +32,6 @@ def as_json(opts={})
TEST_API = Her::API.new

config = Proc.new do |conn|
conn.use FaradayMiddleware::EncodeJson
conn.use Faraday::Request::UrlEncoded
conn.use Her::Middleware::DefaultParseJSON
conn.use Faraday::Adapter::NetHttp
conn.use Faraday::Response::RaiseError
Expand Down

0 comments on commit 456fdd5

Please sign in to comment.