hydroponics 0.3.0 → 0.3.1

data/ChangeLog.markdown

@@ -0,0 +1,11 @@
+# hydroponics 0.3.1
+
+ * Added loading graphic
+ * Fixed row deletion bug in Dupe
+
+# hydroponics 0.3.0 2010-10-29
+
+ * One table action is built-in: "Dupe"
+ * Rails-like tree
+ * JQuery interface
+ * Rails project database manipulation with Sequel

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/app/actions/dupe.rb

@@ -8,15 +8,14 @@ module Hydroponics
 
       current_count = @db[table].count
 
-      time1 = Time.now
       if target_count > current_count
         @db[table].multi_insert([first_row] * (target_count - current_count))
-      else
-        @db[table].filter("id > #{target_count}").delete
+      elsif current_count > target_count
+        cutoff_id = @db[table].map(:id)[target_count-1]
+        @db[table].filter("id > #{cutoff_id}").delete
       end
-      time2 = Time.now
 
-      (time2 - time1).to_s + 's'
+      @db[table].count.to_s
     end
   end
 end

data/app/views/dupe/index.erb

@@ -8,28 +8,31 @@
         <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").slider({
+                $("#slider div").slider({
                     slide: function(event, ui) {
-                        $("#sliderct").html(ui.value);
+                        $("#sliderct").html("<i>" + ui.value + "</i>");
                         $("button").button("enable");
                     },
-                    max: 25000
+                    max: 25000,
+                    value: <%= db[@table].count %>
                 });
 
                 $("button").button();
                 $("button").button("enable");
                 $("button").click(function(){
-                    $("#slider").slider("disable");
+                    $("#slider div").slider("disable");
                     $("button").button("disable");
+                    $(".loader").show();
                     $.ajax({
                         type: "POST",
                         url: "/dupe/<%= @table %>",
                         data: JSON.stringify({
-                            count: $("#slider").slider("value")
+                            count: $("#slider div").slider("value")
                         }),
                         success: function(data, status, xhr) {
                             $("#sliderct").html("<b>" + data + "</b>");
-                            $("#slider").slider("enable");
+                            $("#slider div").slider("enable");
+                            $(".loader").hide();
                         },
                         processData: false
                     });
@@ -37,26 +40,60 @@
             });
         </script>
         <style type="text/css">
-            .stats {
-                width: 400px;
+            .container {width:950px;margin:0 auto;}
+            .dupe h3 {
+                margin: 10px 5px 10px 18px;
+                color: #444;
+                float: left;
             }
-            h1, h3 {
+            .dupe #slider {
+                float: left;
+                width: 352px;
+                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;
+            }
         </style>
         <title>Hydroponics <%= settings.version %></title>
     </head>
 
-    <body>
+    <body class="container">
         <div class="header">
             <h1>Hydroponics</h1>
         </div>
-        <div class="stats">
-            <h3><%= @table.to_s %></h3>
-            <div id='slider'></div>
-            <span id='sliderct'></span>
-            <button>Dupe</button>
-            <p>Count: <%= db[@table].count %></p>
+        <div class="dupecontainer">
+            <div class="dupe">
+                <h3>Dupe</h3>
+                <div id='slider'><div></div></div>
+                <div class="loader" style="display:none;"></div>
+                <div id='button'><button>Update</button></div>
+                <p><%= @table.to_s.gsub("_"," ") %>: <span id='sliderct'><%= db[@table].count %></span></p>
+            </div>
         </div>
     </body>
 </html>

data/hydroponics.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hydroponics}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyler Boyd"]
@@ -15,12 +15,14 @@ Gem::Specification.new do |s|
   s.email = %q{tboyd47@gmail.com}
   s.executables = ["hydro"]
   s.extra_rdoc_files = [
-    "LICENSE",
+    "ChangeLog.markdown",
+     "LICENSE",
      "README.rdoc"
   ]
   s.files = [
     ".document",
      ".gitignore",
+     "ChangeLog.markdown",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
@@ -37,6 +39,7 @@ Gem::Specification.new do |s|
      "spec/hydroponics_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
+     "static/ajax-loader.gif",
      "static/dupe.js",
      "static/test/dupe_test.js",
      "static/test/index.html",

data/spec/hydroponics_spec.rb

@@ -72,6 +72,12 @@ describe "Hydroponics::Actions" do
       @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)
+      @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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hydroponics
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Tyler Boyd
@@ -126,11 +126,13 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
+- ChangeLog.markdown
 - LICENSE
 - README.rdoc
 files: 
 - .document
 - .gitignore
+- ChangeLog.markdown
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -147,6 +149,7 @@ files:
 - spec/hydroponics_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- static/ajax-loader.gif
 - static/dupe.js
 - static/test/dupe_test.js
 - static/test/index.html