clumpy 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c38353f8705241b8dae34ae95ab52774269ad06
-  data.tar.gz: 0141cb18954ed27c7a7946dc2b42c63bf19c668d
+  metadata.gz: 9bdbfef1adbfd8fb569226453e2d580c65e7a348
+  data.tar.gz: 3c199636374d074c3bdb37f5f1f3eb0fa83ee068
 SHA512:
-  metadata.gz: a3b4b2c4b12ed391ad8b0bf7df1477bf9138884d133ab5b08dbb142c421f2c51eed95580078980531458fada02911ec63d38d1248101fe556561f644591e84c4
-  data.tar.gz: 7bcad74a7d125b2a02291ec4108c8c0a5c6e5b801f157edde3a5564bcf7b6e7feb1ce11593aaa652a0070eaeddc15500df30c105848e9408ed75eb96a46524f8
+  metadata.gz: 5f97faf5c646c9079980b883adf831e57fe44b3013553bae88101b4bfc84772139b9d548f8bba145c6f09eb6b57c9fcafe30876894bd0adc177d9df9e01acbea
+  data.tar.gz: f9cbee56548ea77c69f13d97fc4a379bb01c6ee43252451fd0e2558a18fe6863c4f5342a6fe72bdc38711e79fa376539332c83f15a7906bda8ac3332b341f11f

data/.gitignore

@@ -16,3 +16,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+tags

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0
+ruby-2.1.2

data/lib/clumpy.rb

@@ -4,6 +4,8 @@ require "clumpy/cluster_behavior"
 require "clumpy/cluster"
 require "clumpy/builder"
 require "clumpy/extensions/sunspot_hit"
+require "clumpy/extensions/chewy_hit"
+require "clumpy/bounds"
 
 module Clumpy
 end

data/lib/clumpy/bounds.rb

@@ -0,0 +1,27 @@
+module Clumpy
+  class Bounds
+    def initialize(latitude, longitude, side_length)
+      side_length ||= 10
+      @latitude  = (latitude - side_length)..(latitude + side_length)
+      @longitude = (longitude - side_length*2)..(longitude + side_length*2)
+    end
+
+    attr_reader :latitude
+
+    attr_reader :longitude
+
+    def as_json(*)
+      {
+        northeast: {
+          latitude: @latitude.end,
+          longitude: @longitude.end,
+        },
+        southwest: {
+          latitude: @latitude.begin,
+          longitude: @longitude.begin,
+        }
+      }
+    end
+  end
+end
+

data/lib/clumpy/cluster_behavior.rb

@@ -8,54 +8,37 @@ module Clumpy
       @points    = [point]
       @options   = options
 
-      side_length = options.fetch(:side_length) { 10 }
-      @bounds    = OpenStruct.new(
-        latitude: (latitude - side_length)..(latitude + side_length),
-        longitude: (longitude - side_length*2)..(longitude + side_length*2)
-      )
+      @bounds    = Bounds.new(@latitude, @longitude, options[:side_length])
     end
 
     def contains?(point)
-      bounds.latitude.include?(point.latitude) &&
-      bounds.longitude.include?(point.longitude)
+      @bounds.latitude.include?(point.latitude) &&
+      @bounds.longitude.include?(point.longitude)
     end
 
     def reposition
-      @latitude  = points.inject(0.0) { |m, p| m + p.latitude } / points.size
-      @longitude = points.inject(0.0) { |m, p| m + p.longitude } / points.size
+      @latitude  = @points.inject(0.0) { |m, p| m + p.latitude } / @points.size
+      @longitude = @points.inject(0.0) { |m, p| m + p.longitude } / @points.size
     end
 
     def as_json(*)
       {
-        latitude: latitude,
+        latitude:  latitude,
         longitude: longitude,
-        size: points.size,
-        bounds: bounds_as_json,
-        values: value_list
+        size:      @points.size,
+        bounds:    @bounds.as_json,
+        values:    value_list,
       }
     end
 
     def value_list
       case @options[:include_values]
-      when true  then points
+      when true  then @points
       when false then []
       else
         values_threshold = @options[:values_threshold] || 10
-        points.size <= values_threshold ? points : []
+        @points.size <= values_threshold ? @points : []
       end
     end
-
-    def bounds_as_json
-      {
-        northeast: {
-          latitude: bounds.latitude.max,
-          longitude: bounds.longitude.max
-        },
-        southwest: {
-          latitude: bounds.latitude.min,
-          longitude: bounds.longitude.min
-        }
-      }
-    end
   end
 end

data/lib/clumpy/extensions/chewy_hit.rb

@@ -0,0 +1,20 @@
+module Clumpy
+  module Extensions
+    module ChewyHit
+      def latitude
+        @latitude ||= lat.to_f
+      end
+
+      def longitude
+        @longitude ||= lng.to_f
+      end
+
+      def as_json(*)
+        {
+          id:   id,
+          type: _source.full?(:type) || type.classify
+        }
+      end
+    end
+  end
+end

data/lib/clumpy/extensions/sunspot_hit.rb

@@ -2,11 +2,11 @@ module Clumpy
   module Extensions
     module SunspotHit
       def latitude
-        stored(:lat)
+        @latitude ||= stored(:lat)
       end
 
       def longitude
-        stored(:lng)
+        @longitude ||= stored(:lng)
       end
 
       def as_json(*)

data/lib/clumpy/version.rb

@@ -1,3 +1,3 @@
 module Clumpy
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clumpy
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Johannes Opper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,9 +82,11 @@ files:
 - Rakefile
 - clumpy.gemspec
 - lib/clumpy.rb
+- lib/clumpy/bounds.rb
 - lib/clumpy/builder.rb
 - lib/clumpy/cluster.rb
 - lib/clumpy/cluster_behavior.rb
+- lib/clumpy/extensions/chewy_hit.rb
 - lib/clumpy/extensions/sunspot_hit.rb
 - lib/clumpy/version.rb
 - spec/builder_spec.rb
@@ -111,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Cluster a bunch of points