easycomments 1.0.3 → 1.0.4

data/spec/ec/ec_dashboard_spec.rb

@@ -9,6 +9,7 @@ Airborne.configure do |config|
     original_verbosity = $VERBOSE
     $VERBOSE = nil
     DB = Sequel.sqlite
+    DB.extension(:pagination)
     $VERBOSE = original_verbosity
     db_setup
   end
@@ -26,8 +27,16 @@ describe 'ec_dasboard' do
 
   describe "GET /comments" do
     it "returns the comments successfully" do
-      get "/comments", {:post => example_post}
-      expect_json_types({:comments => :array_of_objects})
+      get URI.encode("/comments?post=#{example_post}&page=1")
+      expect_json_types({:comments => :array_of_objects, :page_count => :int})
+    end
+    it "uses page 1 by default" do
+      get URI.encode("/comments?post=#{example_post}")
+      expect_json_types({:comments => :array_of_objects, :page_count => :int})
+    end
+    it "fallbacks to page 1 with wrong page input" do
+      get URI.encode("/comments?post=#{example_post}&page=-3")
+      expect_json_types({:comments => :array_of_objects, :page_count => :int})
     end
   end
   describe "GET /get_all_posts" do
@@ -49,9 +58,17 @@ describe 'ec_dasboard' do
     end
   end
   describe "GET /get_pending_comments" do
-    it "returns the pending comments list for a post successfully" do
-      get "/get_pending_comments", {:post => example_post}
-      expect_json_types({:comments => :array_of_objects})
+    it "returns the comments successfully" do
+      get URI.encode("/get_pending_comments?post=#{example_post}&page=1")
+      expect_json_types({:comments => :array_of_objects, :page_count => :int})
+    end
+    it "uses page 1 by default" do
+      get URI.encode("/get_pending_comments?post=#{example_post}")
+      expect_json_types({:comments => :array_of_objects, :page_count => :int})
+    end
+    it "fallbacks to page 1 with wrong page input" do
+      get URI.encode("/get_pending_comments?post=#{example_post}&page=-3")
+      expect_json_types({:comments => :array_of_objects, :page_count => :int})
     end
   end
   describe "POST /edit_comment" do

data/spec/ec/ec_spec.rb

@@ -9,6 +9,7 @@ Airborne.configure do |config|
     original_verbosity = $VERBOSE
     $VERBOSE = nil
     DB = Sequel.sqlite
+    DB.extension(:pagination)
     $VERBOSE = original_verbosity
     db_setup
   end
@@ -28,6 +29,18 @@ Airborne.configure do |config|
     add_new_comment
     config.rack_app = EC
   end
+  config.before(:each, :paginate => false) do
+    original_verbosity = $VERBOSE
+    $VERBOSE = nil
+    PAGINATE = false
+    $VERBOSE = original_verbosity
+  end
+  config.before(:each, :paginate => true) do
+    original_verbosity = $VERBOSE
+    $VERBOSE = nil
+    PAGINATE = true
+    $VERBOSE = original_verbosity
+  end
 end
 
 describe 'ec' do
@@ -73,9 +86,31 @@ describe 'ec' do
     end
   end
   describe "GET /comments" do
-    it "returns the comments successfully" do
-      get "/comments", {:post => example_post}
-      expect_json_types({:comments => :array_of_objects})
+    context "pagination is off" do
+      it "returns the comments successfully", :paginate => false do
+        get URI.encode("/comments?post=#{example_post}")
+        expect_json_types({:comments => :array_of_objects})
+      end
+      it "it ignores page parameter", :paginate => false do
+        get URI.encode("/comments?post=#{example_post}&page=1")
+        expect_json_types({:comments => :array_of_objects})
+      end
+    end
+    context "pagination is on" do
+      it "returns the comments successfully", :paginate => true do
+        get URI.encode("/comments?post=#{example_post}&page=1")
+        expect_json_types({:comments => :array_of_objects, :page => :int, :total_pages => :int})
+      end
+      it "uses page 1 by default", :paginate => true do
+        get URI.encode("/comments?post=#{example_post}")
+        expect_json_types({:comments => :array_of_objects, :page => :int, :total_pages => :int})
+        expect(json_body[:page]).to be == 1
+      end
+      it "fallbacks to page 1 with wrong page input", :paginate => true do
+        get URI.encode("/comments?post=#{example_post}&page=-3")
+        expect_json_types({:comments => :array_of_objects, :page => :int, :total_pages => :int})
+        expect(json_body[:page]).to be == 1
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -11,8 +11,8 @@ def db_setup
     String :email
     String :post
     String :body
-    TrueClass :approved, :default=>APPROVE_BY_DEFAULT
-    TrueClass :action_taken, :default=>false
+    TrueClass :approved, :default => true
+    TrueClass :action_taken, :default => false
     DateTime :timestamp
   end
 

data/views/index.html

@@ -7,82 +7,4 @@
   <link rel="import" href="/polymer-loader.vulcanized.html">
 </head>
 
-<polymer-element name="ec-index">
-  <template>
-    <style>
-      #container {
-        background-color: #E5E5E5;
-        font-family: 'RobotoDraft', sans-serif;
-        width: 100%;
-        height: 100%;
-      }
-      #login_form {
-        width: 280px;
-        height: 260px;
-        margin-top: 10%;
-      }
-      a {
-        text-decoration: none !important;
-        color: #616161;
-      }
-      #title {
-        padding-left:50px;
-      }
-      #login_button::shadow #ripple {
-        color: #FFA726;
-      }
-      paper-input-decorator /deep/ .focused-underline {
-          /* line color when the input is focused */
-          background-color: #FFB74D;
-      }
-      paper-input-decorator /deep/ #floatedLabelText {
-        color: #616161;
-      }
-    </style>
-    <core-ajax
-      id="login"
-      url="/dashboard/login"
-      method="post"
-      params='{"username":"{{username}}", "password":"{{password}}"}'
-      handleAs="json"
-      on-core-response="{{postLogin}}">
-    </core-ajax>
-    <div horizontal center-justified layout id="container">
-      <paper-shadow id="login_form" vertical  layout>
-      <paper-shadow><div id="title"><a href="/"><h2>EasyComments<h2></a></div></paper-shadow>
-        <paper-input-decorator label="Username" floatingLabel>
-           <input id="username" is="core-input" type="text" value="{{username}}"/>
-        </paper-input-decorator>
-        <paper-input-decorator label="Password" floatingLabel>
-           <input id="password" is="core-input" type="password" value="{{password}}"/>
-        </paper-input-decorator>
-        <paper-button id="login_button" on-click="{{login}}">Login</paper-button>
-      </paper-shadow>
-    </div>
-    <template if="{{has_access}}">
-      <ec-dashboard></ec-dashboard>
-    </template>
-    <paper-toast id="toast1" text="Wrong username or password."></paper-toast>
-  </template>
-  <script>
-    Polymer('ec-index', {
-        login: function() {
-          this.shadowRoot.querySelector("#login").go();
-        },
-        postLogin: function(event, response) {
-          this.has_access = response.response.has_access;
-          if(this.has_access === false){
-            this.shadowRoot.querySelector('#toast1').show();
-          }else{
-            //hide the form
-            this.shadowRoot.querySelector("#container").hidden = true;
-          }
-        },
-        ready: function(){
-          this.has_access = false;
-        },
-    });
-  </script>
-</polymer-element>
-
-<ec-index></ec-index>
+<ec-login></ec-login>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easycomments
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Zisis Maras
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-04-03 00:00:00.000000000 Z
 dependencies: []
 description: |
   EasyComments(EC) is an easy to use comment system with a simple api
@@ -20,9 +20,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -37,6 +37,7 @@ files:
 - lib/easycomments/ec_configuration.rb
 - lib/easycomments/ec_dashboard_model.rb
 - lib/easycomments/ec_model.rb
+- lib/easycomments/ec_pagination.rb
 - public/bower.json
 - public/bower_components/core-a11y-keys/.bower.json
 - public/bower_components/core-a11y-keys/README.md
@@ -392,6 +393,7 @@ files:
 - public/bower_components/webcomponentsjs/webcomponents.min.js
 - public/css/main.css
 - public/elements/ec-dashboard/ec-dashboard.html
+- public/elements/ec-login/ec-login.html
 - public/polymer-loader.html
 - public/polymer-loader.vulcanized.html
 - spec/ec/ec_dashboard_spec.rb
@@ -408,17 +410,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Simple and easy to use comment system