dossier-segmenter 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98e767c99db2057ca87c78226335c4800433514b
-  data.tar.gz: ae308223c209cac474b83bdcb3b94dfb1ee27ace
+  metadata.gz: 9c0a7beee75609a16ea0ebec56fb5ef00ec6c609
+  data.tar.gz: f628f57c53afa32b00ec87dc740529bf7c8e6139
 SHA512:
-  metadata.gz: b569f16bd64f42f669d9962859a1a5995c71a5d8529e540f4e3d03e84ad621e376a904b8be4a12ce11a1a14142ec8250dd3d4f36422613073193be86380ab378
-  data.tar.gz: 381586de07e4e0c898300c1e4f41eca9a1beec68223e1c6af0213f5bb8ac150d7127bb84c813f10ef4539e4f00a1201b0925a455ceed15eb65a09bde35abc9a4
+  metadata.gz: ae6ef17ce24a0160fa5d3cd7278f967d6a1b9326bbef486b89ebf0bce79989c37082ac156681f3f8301eaf08182ccdbea97acea44bcd9e9be3863c1fd7fb1c47
+  data.tar.gz: 32c9e83b729b556be902251c7ecd9e5af9f9dedd5724279176c00538f1757af7a0fb3ca0a3f9d7e59c8eb989a6988e315d69f1fc80f3047384780526570b876a

data/lib/dossier/segment/definition.rb

@@ -1,12 +1,11 @@
 module Dossier
   class Segment
     class Definition
-      attr_accessor :segmenter_class, :report_class, :name, :group_by, :display_name, :next, :prev
+      attr_accessor :segmenter_class, :name, :group_by, :display_name, :next, :prev
       attr_reader :segment_subclass
 
       def initialize(segmenter_class, name, options = {})
         self.segmenter_class = segmenter_class
-        self.report_class    = segmenter_class.report_class
         self.name            = name
         self.group_by        = options.fetch(:group_by, name)
         self.display_name    = options.fetch(:display_name, name)
@@ -53,7 +52,7 @@ module Dossier
       private
 
       def define_segment_subclass
-        @segment_subclass = report_class.const_set(segment_class_name, Class.new(Dossier::Segment))
+        @segment_subclass = segmenter_class.const_set(segment_class_name, Class.new(Dossier::Segment))
       end
 
       def display_name_for_column

data/lib/dossier/segmenter/report.rb

@@ -19,13 +19,6 @@ module Dossier
         def segmenter_class
           const_get(:Segmenter)
         end
-
-        def inherited(base)
-          segmenter_class = Class.new(Dossier::Segmenter)
-          segmenter_class.report_class = base
-          base.const_set(:Segmenter, segmenter_class)
-          super
-        end
       end
 
       Dossier::Report.send :include, self

data/lib/dossier/segmenter/version.rb

@@ -1,5 +1,5 @@
 module Dossier
   class Segmenter
-    VERSION = "0.9.0"
+    VERSION = "0.10.0"
   end
 end

data/spec/dossier/segment/chain_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Dossier::Segment::Chain do
   let(:report_class)    { Class.new(Dossier::Report) }
-  let(:segmenter_class) { report_class.segmenter_class }
+  let(:segmenter_class) { report_class.const_set(:Segmenter, Class.new(Dossier::Segmenter)) }
   let(:definition)      { Dossier::Segment::Definition.new(segmenter_class, :foo) }
   let(:next)            { Dossier::Segment::Definition.new(segmenter_class, :bar) }
   let(:chain)           { described_class.new.tap { |c| c << definition } }

data/spec/dossier/segment/definition_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Dossier::Segment::Definition do
   let(:report_class)    { Class.new(Dossier::Report) }
-  let(:segmenter_class) { report_class.segmenter_class }
+  let(:segmenter_class) { report_class.const_set(:Segmenter, Class.new(Dossier::Segmenter)) }
   let(:definition)      { described_class.new(segmenter_class, :foo) }
 
   describe "attributes" do
@@ -78,7 +78,7 @@ describe Dossier::Segment::Definition do
     end
 
     it "sets up the segment subclasses name constant properly" do
-      expect(CuteAnimalsReport::Family).to be_a Class
+      expect(CuteAnimalsReport::Segmenter::Family).to be_a Class
     end
   end
 end

data/spec/dossier/segment_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 describe Dossier::Segment do
   let(:report_class)     { Class.new(Dossier::Report) }
   let!(:segmenter_class) { 
-    report_class.segmenter_class.tap { |sc|
+    report_class.const_set(:Segmenter, Class.new(Dossier::Segmenter) { |sc|
       sc.segment :foo
-    }
+    })
   }
   let(:definition)      { segmenter_class.segments.first }
   let(:report)          { report_class.new }

data/spec/dossier/segmenter/report_spec.rb

@@ -1,23 +1,9 @@
 require 'spec_helper'
 
 describe Dossier::Segmenter::Report do
-  let(:report_class)    { Class.new(Dossier::Report) }
-  let(:segmenter_class) { report_class.const_get(:Segmenter) }
-  let(:report)          { report_class.new }
-
-  it "creates a segment subclass under its own namespace when inherited" do
-    expect(segmenter_class.ancestors).to include(Dossier::Segmenter)
-  end
-
-  it "sets its class on the created segment_class" do
-    expect(segmenter_class.report_class).to eq report_class
-  end
 
   it "has a reference to its segmenter class" do
     expect(CuteAnimalsReport.segmenter_class).to eq CuteAnimalsReport::Segmenter
   end
 
-  it "does not have a segmenter if no segments have been defined" do
-    expect(report).to_not be_segmented
-  end
 end

data/spec/dossier/segmenter_spec.rb

@@ -4,14 +4,12 @@ describe Dossier::Segmenter do
 
   let(:report_class)    { Class.new(Dossier::Report) }
   let!(:segmenter_class) {
-    report_class.segmenter_class.tap do |klass|
-      klass.instance_eval do
+    report_class.const_set(:Segmenter, Class.new(described_class) {
         segment :family
         segment :domestic, display_name: ->(row) { "#{row[:domestic] ? 'Domestic' : 'Wild'} #{row[:group_name]}" } do
           segment :group,  display_name: :group_name, group_by: :group_id
         end
-      end
-    end
+    })
   }
   let(:headers)   { CuteAnimalsReport::HEADERS.call }
   let(:rows)      { CuteAnimalsReport::ROWS.call    }
@@ -69,10 +67,6 @@ describe Dossier::Segmenter do
   end
 
   describe "class" do
-    it "has a reference to the report that created it" do
-      expect(segmenter_class.report_class).to eq report_class
-    end
-
     it "determines headers to skip when displaying" do
       expect(segmenter_class.skip_headers.sort).to eq %w[family group_name group_id domestic].sort
     end
@@ -81,7 +75,7 @@ describe Dossier::Segmenter do
   describe "DSL" do
     describe "segment" do
       describe "definition creation" do
-        let(:segmenter_class) { report_class.segmenter_class }
+        let(:segmenter_class) { report_class.const_set(:Segmenter, Class.new(described_class)) }
         let(:definition)      { segmenter_class.segments.last }
 
         it "creates a segment definition" do

data/spec/dummy/app/reports/cute_animals_report.rb

@@ -32,7 +32,7 @@ class CuteAnimalsReport < Dossier::Report
     formatter.number_to_dollars(value)
   end
 
-  class Segmenter
+  class Segmenter < Dossier::Segmenter
     segment :family
     segment :domestic, display_name: ->(row) { "#{row[:domestic] ? 'Domestic' : 'Wild'} #{row[:group_name]}" }
     segment :group,    display_name: :group_name, group_by: :group_id

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dossier-segmenter
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Adam Hunter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dossier
@@ -136,7 +136,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- app/views/dossier/reports/cute_animals.html.haml
 - dossier-segmenter.gemspec
 - lib/dossier/segment.rb
 - lib/dossier/segment/chain.rb
@@ -156,6 +155,7 @@ files:
 - spec/dossier/segmenter/report_spec.rb
 - spec/dossier/segmenter_spec.rb
 - spec/dummy/app/reports/cute_animals_report.rb
+- spec/dummy/app/views/dossier/reports/cute_animals.html.haml
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/public/favicon.ico
@@ -194,6 +194,7 @@ test_files:
 - spec/dossier/segmenter/report_spec.rb
 - spec/dossier/segmenter_spec.rb
 - spec/dummy/app/reports/cute_animals_report.rb
+- spec/dummy/app/views/dossier/reports/cute_animals.html.haml
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/public/favicon.ico