click 0.1.0 → 0.1.1

data/bin/click-console

@@ -10,11 +10,7 @@ module Click::Database
     connection_string = "#{ARGV.fetch(0, default_connection_string)}"
     puts "Using connection string: #{connection_string}"
 
-    Click::Database.with_database(connection_string) do |db|
-      clicker = Click::Clicker.new('click-console')
-      require 'click/database/writer'
-      clicker.add_observer(Click::Database::Writer.new(db))
-
+    Click.clicker_with_database('click-console', connection_string) do |clicker|
       puts
       puts 'A clicker was initialized to write to that database.'
       puts 'You can access it as `clicker`.'

data/demo/app.rb

@@ -23,18 +23,12 @@ Thread.abort_on_exception = true
 
 Thread.new do
   begin
-    clicker = nil
-    Click::Database.with_database('sqlite:///tmp/click_demo_memory.sqlite') do |click_db|
-      require 'click/database/writer'
-      writer = Click::Database::Writer.new(click_db)
-      clicker = Click::Clicker.new("Click demo app")
-      clicker.add_observer(writer)
-    end
-
-    loop do
-      clicker.click!
-      puts 'Click!'
-      sleep 10
+    Click.clicker_with_database('Click demo app', 'sqlite:///tmp/click_demo_memory.sqlite') do |clicker|
+      loop do
+        clicker.click!
+        puts 'Click!'
+        sleep 10
+      end
     end
   rescue => e
     puts "Exception in Click thread: #{e}"
@@ -56,6 +50,8 @@ end
 
 $garbage = []
 get '/make_objects/:count' do |count|
+  Visit.create(ip_address: request.ip, timestamp: Time.now)
+
   $garbage.concat(Array.new(count.to_i) { Object.new })
   "I made #{count} object(s) just for you :)"
 end

data/lib/click/clicker.rb

@@ -48,4 +48,16 @@ module Click
       @observers ||= []
     end
   end
+
+  class << self
+    def clicker_with_database(session_name, connection_string)
+      Click::Database.with_database(connection_string) do |db|
+        require 'click/database/writer'
+        writer = Click::Database::Writer.new(db)
+        clicker = Click::Clicker.new(session_name)
+        clicker.add_observer(writer)
+        yield clicker
+      end
+    end
+  end
 end

data/lib/click/database/models/object_count.rb

@@ -11,6 +11,10 @@ module Click
             snapshot_dataset = Snapshot.by_session_name(session_name)
             from_self.qualify.join(snapshot_dataset, id: :snapshot_id)
           end
+
+          def snapshots
+            Snapshot.where(id: from_self.map(:snapshot_id).uniq)
+          end
         end
       end
     end

data/lib/click/database/models/session.rb

@@ -4,12 +4,16 @@ module Click
   module Database
     module Models
       class Session < Sequel::Model
-        one_to_many :snapshot
+        one_to_many :snapshots
 
         dataset_module do
           def by_name(name)
             from_self.where(name: name)
           end
+
+          def snapshots
+            Snapshot.where(session_id: from_self.map(:id))
+          end
         end
       end
     end

data/lib/click/database/models/snapshot.rb

@@ -4,6 +4,7 @@ module Click
   module Database
     module Models
       class Snapshot < Sequel::Model
+        many_to_one :session
         one_to_many :object_counts
 
         dataset_module do
@@ -19,6 +20,14 @@ module Click
             session_dataset = Session.where(name: session_name)
             from_self.qualify.join(session_dataset, id: :session_id)
           end
+
+          def sessions
+            Session.where(id: from_self.map(:session_id).uniq)
+          end
+
+          def object_counts
+            ObjectCount.where(snapshot_id: from_self.map(:id).uniq)
+          end
         end
       end
     end

data/lib/click/version.rb

@@ -1,3 +1,3 @@
 module Click
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/database/models/object_count_spec.rb

@@ -23,6 +23,22 @@ module Click::Database::Models
           end
         end
       end
+
+      describe '.sessions' do
+        it 'returns the sessions owning the object counts' do
+          with_in_memory_db do
+            ignored_session = Session.create(name: 'ignored', started_at: Time.now)
+            ignored_snapshot = Snapshot.create(timestamp: Time.now, session_id: ignored_session.id)
+            50.times { ObjectCount.create(class_name: "Foo", count: 1, snapshot_id: ignored_snapshot.id) }
+
+            important_session = Session.create(name: 'important', started_at: Time.now)
+            important_snapshot = Snapshot.create(timestamp: Time.now, session_id: important_session.id)
+            important_object_count = ObjectCount.create(class_name: "Bar", count: 2, snapshot_id: important_snapshot.id)
+
+            expect(ObjectCount.where(class_name: 'Bar').snapshots.all).to eq([important_snapshot])
+          end
+        end
+      end
     end
   end
 end

data/spec/database/models/session_spec.rb

@@ -18,6 +18,23 @@ module Click::Database::Models
           end
         end
       end
+
+      describe '.snapshots' do
+        it 'returns all the snapshots belonging to the set of sessions' do
+          with_in_memory_db do
+            ignored_session = Session.create(name: 'ignored', started_at: Time.now)
+            50.times { ignored_session.add_snapshot(Snapshot.new(timestamp: Time.now))}
+
+            session = Session.create(name: 'important', started_at: Time.now)
+            snapshot = session.add_snapshot(Snapshot.new(timestamp: Time.now))
+
+            other_session = Session.create(name: 'important', started_at: Time.now)
+            other_snapshot = other_session.add_snapshot(Snapshot.new(timestamp: Time.now))
+
+            expect(Session.by_name('important').snapshots.map(:id)).to match_array([snapshot.id, other_snapshot.id])
+          end
+        end
+      end
     end
   end
 end

data/spec/database/models/snapshot_spec.rb

@@ -46,6 +46,35 @@ module Click::Database::Models
         end
       end
 
+      describe '.sessions' do
+        it 'returns sessions owning the current snapshots' do
+          with_in_memory_db do
+            Session.create(name: 'ignored', started_at: Time.now)
+
+            important_session = Session.create(name: 'important', started_at: Time.now)
+            Snapshot.create(timestamp: Time.now, session_id: important_session.id)
+
+            expect(Snapshot.dataset.sessions.all).to eq([important_session])
+          end
+        end
+      end
+
+      describe '.object_counts' do
+        it 'returns object counts owned by the current snapshots' do
+          with_in_memory_db do
+            Session.create(name: 'ignored', started_at: Time.now).
+              add_snapshot(Snapshot.new(timestamp: Time.now)).
+              add_object_count(ObjectCount.new(class_name: 'Bar', count: 1))
+
+            session = Session.create(name: 'important', started_at: Time.now)
+            snapshot = Snapshot.create(timestamp: Time.now, session_id: session.id)
+            object_count = snapshot.add_object_count(ObjectCount.new(class_name: 'Foo', count: 5))
+
+            expect(Snapshot.where(session_id: session.id).object_counts.all).to eq([object_count])
+          end
+        end
+      end
+
       it 'can combine scopes' do
         with_in_memory_db do
           described_class.create(timestamp: Date.new(2000), session_id: session_id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: click
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler