RubyGems - hydroponics - Versions diffs - 0.3.2 → 0.3.3 - Mend

hydroponics 0.3.2 → 0.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

data/ChangeLog.markdown +5 -0
data/VERSION +1 -1
data/app/actions/dupe.rb +8 -5
data/app/actions/foreigndupe.rb +37 -0
data/app/views/foreign_dupe/index.erb +111 -0
data/config/hydro_app.rb +8 -4
data/hydroponics.gemspec +4 -2
data/spec/hydro_app_spec.rb +19 -3
data/spec/hydroponics_spec.rb +44 -4
data/spec/spec_helper.rb +8 -0
metadata +6 -4

data/ChangeLog.markdown CHANGED Viewed

@@ -1,3 +1,8 @@
+# hydroponics 0.3.3
+ * Generalized the routes, so new actions can be added without changing them
+ * Added an action, Foreign Dupe for duplicating rows in a table while incrementing a foreign key.
 # hydroponics 0.3.2
  * Fixed require statements so other machines can run the gem

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 0.3.2
1	+ 0.3.3

data/app/actions/dupe.rb CHANGED Viewed

@@ -1,14 +1,17 @@
 module Hydroponics
   module Actions
-    def dupe(table, target_count)
+    # Dupe
+    #
+    # Change the total rows of a table to target_count, either by duplicating
+    # the first row or deleting rows from the end.
+    def dupe(table, data)
       table = table.to_sym
-      first_row = @db[table].first
-      first_row.delete(:id)
       current_count = @db[table].count
+      target_count = data['count'] || current_count
       if target_count > current_count
+        first_row = @db[table].first
+        first_row.delete(:id)
         @db[table].multi_insert([first_row] * (target_count - current_count))
       elsif current_count > target_count
         cutoff_id = @db[table].map(:id)[target_count-1]

data/app/actions/foreigndupe.rb ADDED Viewed

@@ -0,0 +1,37 @@
+require 'active_support/inflector'
+require 'active_support/core_ext'
+module Hydroponics
+  module Actions
+    # Foreign Dupe
+    #
+    # Just like Dupe, except it pulls valid foreign keys from table foreign_table.
+    #
+    # It starts from the beginning and increments as it goes.
+    def foreign_dupe(table, data)
+      table = table.to_sym
+      data.stringify_keys!
+      foreign_table = data['foreign_table'].to_sym
+      foreign_key_col = data['foreign_key'] || (foreign_table.to_s.singularize + "_id")
+      foreign_key_col = foreign_key_col.to_sym
+      current_count = @db[table].count
+      target_count = data['count'] || current_count
+      if target_count > current_count
+        foreign_ids = @db[foreign_table].map(:id)
+        first_row = @db[table].first
+        first_row.delete(:id)
+        n = target_count - current_count
+        @db[table].multi_insert( (1..n).collect { |i|
+          first_row.merge( Hash[foreign_key_col, foreign_ids[i % foreign_ids.size]] )
+        } )
+      elsif current_count > target_count
+        cutoff_id = @db[table].map(:id)[target_count-1]
+        @db[table].filter("id > #{cutoff_id}").delete
+      end
+      @db[table].count.to_s
+    end
+  end
+end

data/app/views/foreign_dupe/index.erb ADDED Viewed

@@ -0,0 +1,111 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+    <head>
+        <link href="../vendor/jquery-ui-1.8.5.custom/css/smoothness/jquery-ui-1.8.5.custom.css" media="screen" rel="stylesheet" type="text/css" />
+        <script type="text/javascript" src="../vendor/jquery-ui-1.8.5.custom/js/jquery-1.4.2.min.js"></script>
+        <script type="text/javascript" src="../vendor/jquery-ui-1.8.5.custom/js/jquery-ui-1.8.5.custom.min.js"></script>
+        <script type="text/javascript">
+            $(function(){
+                $("#slider div").slider({
+                    slide: function(event, ui) {
+                        $("#sliderct").html("<i>" + ui.value + "</i>");
+                        $("button").button("enable");
+                    },
+                    max: 25000,
+                    value: <%= db[@table].count %>
+                });
+                $("button").button();
+                $("button").button("enable");
+                $("button").click(function(){
+                    $("#slider div").slider("disable");
+                    $("button").button("disable");
+                    $(".loader").show();
+                    var postData = {
+                        count: $("#slider div").slider("value"),
+                        foreign_table: "<%= params[:foreign_table] %>"
+                    };
+                    if($("#foreign_key").val() != "") {
+                        postData.foreign_key = $("#foreign_key").val()
+                    }
+                    $.ajax({
+                        type: "POST",
+                        url: "/foreign_dupe/<%= @table %>",
+                        data: JSON.stringify(postData),
+                        success: function(data, status, xhr) {
+                            $("#sliderct").html("<b>" + data + "</b>");
+                            $("#slider div").slider("enable");
+                            $(".loader").hide();
+                        },
+                        processData: false
+                    });
+                });
+            });
+        </script>
+        <style type="text/css">
+            .container {width:950px;margin:0 auto;}
+            .dupe h3 {
+                margin: 10px 5px 10px 18px;
+                color: #444;
+                float: left;
+            }
+            .dupe #slider {
+                float: left;
+                width: 252px;
+                margin: 16px 12px;
+            }
+            .dupecontainer {
+                height: 130px;
+                width: 501px;
+            }
+            .dupe {
+                height: 106px;
+                width: 500px;
+                border: 1px #ddd solid;
+            }
+            .dupe #button {
+                float: right;
+                margin: 2px 12px;
+            }
+            .dupe p {
+                padding: 50px 18px;
+                font-size: 12px;
+            }
+            h1, h3, p {
+                font-family: Verdana,Arial,sans-serif
+            }
+            .loader {
+                background-image: url('../ajax-loader.gif');
+                width: 32px;
+                height: 16px;
+                margin-top:16px;
+                float: left;
+            }
+            .dupe input {
+                float: right;
+                margin-top: 12px;
+            }
+        </style>
+        <title>Hydroponics <%= settings.version %></title>
+    </head>
+    <body class="container">
+        <div class="header">
+            <h1>Hydroponics</h1>
+        </div>
+        <div class="dupecontainer">
+            <div class="dupe">
+                <h3>Foreign Dupe</h3>
+                <div id='slider'><div></div></div>
+                <div class="loader" style="display:none;"></div>
+                <div id='button'><button>Update</button></div>
+                <input id='foreign_key'></input>
+                <p><%= @table.to_s.gsub("_"," ") %>: <span id='sliderct'><%= db[@table].count %></span></p>
+            </div>
+        </div>
+    </body>
+</html>

data/config/hydro_app.rb CHANGED Viewed

@@ -19,13 +19,17 @@ class HydroApp < Sinatra::Base
   set :public, File.join(File.dirname(__FILE__), "../static")
   set :version, File.read(File.join(File.dirname(__FILE__), "../VERSION")).chomp
-  post '/dupe/:table' do |table|
+  # new actions can be used without any changes to the routes, as long as they follow
+  # the existing format.
+  # => ex: GET /dupe/users; POST /dupe/users {count: 10}
+  # => ex: GET /foreign_dupe/portfolios?foreign_table=users; POST /foreign_dupe/users {count: 100, foreign_table: 'users'}
+  post '/:action/:table' do |action, table|
     data = JSON.parse(request.body.read)
-    dupe(table, data['count'])
+    send(action.to_sym, table, data)
   end
-  get '/dupe/:table' do |table|
+  get '/:action/:table' do |action, table|
     @table = table.to_sym
-    erb :"dupe/index"
+    erb :"#{action}/index"
   end
 end

data/hydroponics.gemspec CHANGED Viewed

@@ -5,11 +5,11 @@
 Gem::Specification.new do |s|
   s.name = %q{hydroponics}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyler Boyd"]
-  s.date = %q{2010-10-29}
+  s.date = %q{2010-11-03}
   s.default_executable = %q{hydro}
   s.description = %q{A user interface to seed or destroy large quantities of data in a Rails app.}
   s.email = %q{tboyd47@gmail.com}
@@ -28,7 +28,9 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "app/actions/dupe.rb",
+     "app/actions/foreigndupe.rb",
      "app/views/dupe/index.erb",
+     "app/views/foreign_dupe/index.erb",
      "bin/hydro",
      "config/hydro_app.rb",
      "hydroponics.gemspec",

data/spec/hydro_app_spec.rb CHANGED Viewed

@@ -31,7 +31,7 @@ describe "HydroApp" do
       it "should show the table's count" do
         get '/dupe/users'
-        last_response.body.include?("Count: " + @db[:users].count.to_s).should be_true
+        last_response.body.include?("<span id='sliderct'>" + @db[:users].count.to_s).should be_true
       end
     end
@@ -42,9 +42,25 @@ describe "HydroApp" do
         @db[:users].count.should == 10
       end
-      it "should return the time elapsed on success" do
+      it "should return the final count on success" do
         post '/dupe/users', {:count => 10}.to_json
-        last_response.body.match(/s$/).should be_true
+        last_response.body.match("10").should be_true
+      end
+    end
+    describe "/foreigndupe/*" do
+      it "should open foreigndupe/index.erb" do
+        get '/foreign_dupe/portfolios'
+        last_response.should be_ok
+      end
+    end
+    describe "/foreign_dupe/*/*" do
+      it "should copy the first row n times" do
+        @db[:users].multi_insert([{:name => "ABC", :email => "123@example.com"}] * 10)
+        post '/foreign_dupe/portfolios', {:count => 10, :foreign_table => 'users'}.to_json
+        last_response.should be_ok
+        @db[:portfolios].count.should == 10
       end
     end
   end

data/spec/hydroponics_spec.rb CHANGED Viewed

@@ -61,27 +61,67 @@ describe "Hydroponics::Actions" do
   describe "#dupe" do
     it "should duplicate the first user until the desired count is reached" do
-      dupe(:users, 10)
+      dupe(:users, {'count' => 10})
       @db[:users].count.should == 10
     end
     it "should delete users from the end until the desired count is reached" do
       @db[:users].multi_insert([{:name => "ABC", :email => "123@example.com"}] * 10)
       @db[:users].count.should == 11
-      dupe(:users, 2)
+      dupe(:users, {'count' => 2})
       @db[:users].count.should == 2
     end
     it "should handle non-consecutive id numbers" do
       @db[:users].multi_insert([{:id => 6789, :name => "ABC", :email => "123@example.com"}, {:id => 6790, :name => "ABC", :email => "123@example.com"}])
-      dupe(:users, 2)
+      dupe(:users, {'count' => 2})
       @db[:users].count.should == 2
     end
     it "should require the table name and count" do
       lambda { dupe }.should raise_error
       lambda { dupe(:users) }.should raise_error
-      lambda { dupe(16) }.should raise_error
+      lambda { dupe({'count' => 16}) }.should raise_error
+    end
+  end
+  describe "#foreigndupe" do
+    it "should copy the first row n times" do
+      @db[:users].multi_insert([{:name => "ABC", :email => "123@example.com"}] * 10)
+      foreign_dupe('portfolios', {:count => 10, :foreign_table => 'users'})
+      @db[:portfolios].count.should == 10
+    end
+    it "should add the foreign key" do
+      @db[:users].multi_insert([{:name => "ABC", :email => "123@example.com"}] * 10)
+      foreign_dupe('portfolios', {:count => 10, :foreign_table => 'users'})
+      @db[:portfolios].map(:user_id)[9].should > 0
+    end
+    it "should return the table's count" do
+      @db[:users].multi_insert([{:name => "ABC", :email => "123@example.com"}] * 10)
+      foreign_dupe('portfolios', {:count => 10, :foreign_table => 'users'}).should == "10"
+    end
+    it "should allow a custom foreign key name" do
+      @db.drop_table :portfolios if @db.table_exists?(:portfolios)
+      @db.create_table :portfolios do
+        primary_key :id
+        Integer :custom_id
+        String :experience
+        String :education
+      end
+      @db[:portfolios].insert(:experience => "None", :education => "None", :custom_id => @db[:users].first[:id])
+      foreign_dupe('portfolios', {:count => 10, :foreign_table => 'users', :foreign_key => "custom_id"}).should == "10"
+      @db[:portfolios].map(:custom_id)[9].should > 0
+    end
+    it "should start from the beginning of the foreign table if it runs out of foreign keys" do
+      @db[:users].multi_insert([{:name => "ABC", :email => "123@example.com"}] * 9) # so there are 10 total.
+      foreign_dupe('portfolios', {:count => 11, :foreign_table => 'users'})
+      @db[:portfolios].map(:user_id)[1].should == @db[:users].map(:id)[1]
+      @db[:portfolios].map(:user_id)[10].should == @db[:users].map(:id)[0]
     end
   end
 end

data/spec/spec_helper.rb CHANGED Viewed

@@ -26,10 +26,18 @@ end
 def populate_test_db
   db = Hydroponics.db
   db.drop_table :users if db.table_exists?(:users)
+  db.drop_table :portfolios if db.table_exists?(:portfolios)
   db.create_table :users do
     primary_key :id
     String :name
     String :email
   end
+  db.create_table :portfolios do
+    primary_key :id
+    Integer :user_id
+    String :experience
+    String :education
+  end
   db[:users].insert(:name => "Acorn Hrefski", :email => "acorn@example.com")
+  db[:portfolios].insert(:experience => "None", :education => "None", :user_id => db[:users].first[:id])
 end

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: hydroponics
 version: !ruby/object:Gem::Version
-  hash: 23
+  hash: 21
   prerelease: false
   segments:
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors:
 - Tyler Boyd
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-10-29 00:00:00 -04:00
+date: 2010-11-03 00:00:00 -04:00
 default_executable: hydro
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -138,7 +138,9 @@ files:
 - Rakefile
 - VERSION
 - app/actions/dupe.rb
+- app/actions/foreigndupe.rb
 - app/views/dupe/index.erb
+- app/views/foreign_dupe/index.erb
 - bin/hydro
 - config/hydro_app.rb
 - hydroponics.gemspec