snowman-io 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d73db25f824921779ff4ca25cac4e2571556c2f
-  data.tar.gz: 8527bd4a2d72ea9b4a9628b310f463b4c4beed80
+  metadata.gz: e582711a3847fef089ccfbc950dfbce1c36fe4fc
+  data.tar.gz: a1160bf7102d58dfce882ca37fe3d719fbad831b
 SHA512:
-  metadata.gz: 9b7f173b5e743eed29fc6df94a191af470fa7760e39724bd6c5a635dfa944780defba9e4e70332ce4579a4e4fceb298cfa7d6e74ba45aa1452a063119ac1712b
-  data.tar.gz: 1ade6d4213bc68b86af2544b6a1a59391c2ff5ffe344e32423e801be1d9725baea971626ae81875960d4e22c948258cdf1e4902a3e0218e34003dbc792fa7ece
+  metadata.gz: c8df6d214fae6b3bae1f27d09b208f4d17923875a156e123c1a21b3e2486998ae1b36b09862b5dceeb68e0a96fea35984cf6190d8d06080d4a151c566c7c4b11
+  data.tar.gz: 840be04724b4c5a727af9eb9ca0142e580124f4c0d0a30d46f1817a696bfc01daab0feb981da071f638d650a3dbbe03e3aa5f36215df53c7d2a2f88b34029bb5

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # SnowmanIO
 
-Version 0.0.6 - 2015.06.08
+Version 0.1.0 - 2015.07.11
+- Remove daily reports
+- Cover almost all server code with specs
+
+Version 0.0.6 - 2015.06.09
 - Need 4.2 actionmailer at least
 
 Version 0.0.5 - 2015.06.08

data/lib/snowman-io.rb

@@ -22,11 +22,10 @@ require "snowman-io/launcher"
 require "snowman-io/cli"
 require "snowman-io/web_server"
 require "snowman-io/aggregate"
-require "snowman-io/reports"
 require "snowman-io/loop/ping"
 require "snowman-io/loop/main"
 require "snowman-io/loop/checks"
-require "snowman-io/report_mailer"
+require "snowman-io/snow_mailer"
 require "snowman-io/migration"
 
 require "snowman-io/models/concerns/tokenable"
@@ -42,7 +41,10 @@ require "snowman-io/models/following"
 
 ActionMailer::Base.raise_delivery_errors = true
 ActionMailer::Base.view_paths = File.dirname(__FILE__) + "/snowman-io/views"
-if ENV["DEV_MODE"].to_i == 1
+
+if ENV["TEST_MODE"].to_i == 1
+  ActionMailer::Base.delivery_method = :test
+elsif ENV["DEV_MODE"].to_i == 1
   Object.send(:remove_const, :Rails)
   require "letter_opener"
   ActionMailer::Base.add_delivery_method :letter_opener,
@@ -64,7 +66,6 @@ end
 module SnowmanIO
   BASE_URL_KEY = "base_url"
   FORCE_SSL_KEY = "force_ssl"
-  NEXT_REPORT_DATE_KEY = "next_report_date"
 
   def self.logger
     @logger ||= Logger.new(STDERR)

data/lib/snowman-io/api.rb

@@ -9,6 +9,9 @@ require 'snowman-io/api/metrics'
 require 'snowman-io/api/checks'
 require 'snowman-io/api/agent'
 require 'snowman-io/api/fridge'
+require 'snowman-io/api/invites'
+require 'snowman-io/api/profile'
+require 'snowman-io/api/friendship'
 
 module SnowmanIO
   module API
@@ -33,6 +36,9 @@ module SnowmanIO
 
       prefix :api
       mount Users
+      mount Invites
+      mount Profile
+      mount Friendship
       mount Apps
       mount Info
       mount Metrics

data/lib/snowman-io/api/agent.rb

@@ -6,21 +6,28 @@ module SnowmanIO
         desc "Report metrics from agent"
         params do
           requires :token, type: String
-          optional :metrics, type: Array
+          optional :metrics, type: Array do
+            requires :name, type: String
+            requires :kind, type: String
+            requires :value
+          end
         end
         post "metrics" do
-          if app = App.where(token: params[:token]).first
-            params[:metrics].each do |metric|
+          if app = App.where(token: permitted_params[:token]).first
+            processed = 0
+            accepted = 0
+            (permitted_params[:metrics] || []).each do |metric|
+              processed += 1
               if Metric.supported?(metric["kind"])
                 app.register_metric_value(metric["name"], metric["kind"], metric["value"].to_f, Time.now)
+                accepted += 1
               end
             end
-            "OK"
+            {status: "ok", processed: processed, accepted: accepted}
           else
-            "WRONG APP"
+            {status: "rejected", reason: "WRONG APP"}
           end
         end
-
       end
     end
   end

data/lib/snowman-io/api/apps.rb

@@ -36,7 +36,8 @@ module SnowmanIO
 
           desc "Deletes app"
           delete do
-            Extra::Meteor.model_destroy(App, @app)
+            Extra::Meteor.model_destroy(@app)
+            {status: "ok"}
           end
         end
       end

data/lib/snowman-io/api/auth_helpers.rb

@@ -22,7 +22,7 @@ module SnowmanIO
           # Code below grabbed from [Ruby on Rails](https://github.com/rails/rails)
           def authenticate_user_from_token
             authenticate_with_http_token do |token, options|
-              # # Let use only token for authentication
+              # # Let use only token for authentication. It helps to keep session after email change.
               # user_email    = options[:email]
               # user_email && User.where(email: user_email, authentication_token: token).first
               User.where(authentication_token: token).first

data/lib/snowman-io/api/checks.rb

@@ -7,15 +7,15 @@ module SnowmanIO
         params do
           requires :check, type: Hash do
             requires :metric_id, type: String
+            requires :template, type: String
             requires :cmp, type: String
             requires :value, type: Float
-            requires :template, type: String
           end
         end
         post do
           metric = Metric.find(permitted_params[:check][:metric_id])
           { check: metric.checks.create!(
-            permitted_params[:check].to_h.except("metric_id").merge("user_id" => current_user._id)
+            permitted_params[:check].to_h.except("metric_id").merge("user_id" => current_user.id)
           ) }
         end
 
@@ -24,16 +24,12 @@ module SnowmanIO
             @check = Check.find(params[:id])
           end
 
-          get do
-            { check: @check }
-          end
-
           params do
             requires :check, type: Hash do
               requires :metric_id, type: String
+              requires :template, type: String
               requires :cmp, type: String
               requires :value, type: Float
-              requires :template, type: String
             end
           end
           put do
@@ -45,12 +41,12 @@ module SnowmanIO
             } }
           end
 
-          put 'resolve' do
-            { check: @check.tap { |m| m.update_attributes!(triggered: false) } }
+          delete do
+            Extra::Meteor.model_destroy(@check)
           end
 
-          delete do
-            Extra::Meteor.model_destroy(Check, @check)
+          put 'resolve' do
+            { check: @check.tap { |m| m.update_attributes!(triggered: false) } }
           end
         end
       end

data/lib/snowman-io/api/extra/meteor.rb

@@ -35,8 +35,8 @@ module SnowmanIO
           end
         end
 
-        def self.model_destroy(model, record)
-          Deleted.create!(model_kind: model.to_s, model_id: record.id.to_s)
+        def self.model_destroy(record)
+          Deleted.create!(model_kind: record.class.to_s, model_id: record.id.to_s)
           record.destroy
         end
       end

data/lib/snowman-io/api/friendship.rb

@@ -0,0 +1,37 @@
+module SnowmanIO
+  module API
+    class Friendship < Grape::API
+      before(&:authenticate!)
+
+      namespace :users do
+        desc "Follow user"
+        post ":id/follow" do
+          authenticate!
+          if user = User.where(id: params[:id]).first
+            current_user.follow!(user)
+            current_user.touch
+            user.touch
+            { users: [current_user, user] }
+          else
+            status 400
+            { status: "failed" }
+          end
+        end
+
+        desc "Unfollow user"
+        post ":id/unfollow" do
+          authenticate!
+          if user = User.where(id: params[:id]).first
+            current_user.unfollow!(user)
+            current_user.touch
+            user.touch
+            { users: [current_user, user] }
+          else
+            status 400
+            { status: "failed" }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/snowman-io/api/invites.rb

@@ -0,0 +1,85 @@
+module SnowmanIO
+  module API
+    class Invites < Grape::API
+      namespace :users do
+        params do
+          requires :email, type: String
+        end
+        post "invite" do
+          authenticate!
+          if User.where(email: permitted_params[:email]).empty?
+            user = User.create!(
+              email: permitted_params[:email],
+              password: SecureRandom.hex,
+              status: "wait_invite"
+            )
+            user.invite!(current_user)
+            { user: user }
+          else
+            status 400
+            { message: "wrong invite request" }
+          end
+        end
+
+        post ":id/resend_invite" do
+          authenticate!
+          user = User.where(status: "wait_invite", id: params[:id]).first
+
+          if user && user.invite_token.present?
+            user.invite!(current_user)
+            { user: user }
+          else
+            status 400
+            { message: "wrong invite resend request" }
+          end
+        end
+
+        post ":id/cancel_invite" do
+          authenticate!
+          user = User.where(status: "wait_invite", id: params[:id]).first
+
+          if user && user.invite_token.present?
+            user.destroy
+            { status: "ok" }
+          else
+            status 400
+            { message: "wrong invite cancel request" }
+          end
+        end
+
+        params do
+          requires :token, type: String
+        end
+        post "check_invite" do
+          {
+            correct: !!(
+              permitted_params[:token].present? &&
+              User.where(status: "wait_invite", invite_token: permitted_params[:token]).first
+            )
+          }
+        end
+
+        params do
+          requires :token, type: String
+          requires :name, type: String
+          requires :password, type: String
+        end
+        post "accept_invite" do
+          token = permitted_params[:token]
+          if token.present? && (user = User.where(status: "wait_invite", invite_token: token).first)
+            user.update_attributes!(
+              name: permitted_params[:name],
+              password: permitted_params[:password],
+              status: "active",
+              invite_token: ""
+            )
+            { user: user }
+          else
+            status 400
+            { message: "SnowmanIO bad accept_invite request" }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/snowman-io/api/metrics.rb

@@ -4,42 +4,13 @@ module SnowmanIO
       before(&:authenticate!)
 
       namespace :metrics do
-        params do
-          requires :metric, type: Hash do
-            requires :app_id, type: String
-            requires :name, type: String
-            requires :kind, type: String
-            optional :metric_name, type: String
-          end
-        end
-        post do
-          app = App.find(permitted_params[:metric][:app_id])
-          { metric: app.metrics.create!(permitted_params[:metric].to_h.except("app_id")) }
-        end
-
         route_param :id do
           before do
             @metric = Metric.find(params[:id])
           end
 
-          get do
-            { metric: @metric }
-          end
-
-          params do
-            requires :metric, type: Hash do
-              requires :app_id, type: String
-              requires :name, type: String
-              requires :kind, type: String
-              optional :metric_name, type: String
-            end
-          end
-          put do
-            { metric: @metric.tap { |m| m.update_attributes!(permitted_params[:metric].to_h.except("app_id")) } }
-          end
-
           delete do
-            Extra::Meteor.model_destroy(Metric, @metric)
+            Extra::Meteor.model_destroy(@metric)
           end
 
           # Returns data to render chart for metric
@@ -66,22 +37,21 @@ module SnowmanIO
               { datapoints: datapoints }
 
             else
-              if params[:duration] == "history"
-                from = @metric.aggregations.where(precision: "daily").order_by("at" => "asc").first.try(:at)
-                to = @metric.aggregations.where(precision: "daily").order_by("at" => "asc").last.try(:at)
-                precision = "daily"
-                delta = 1.day
-                return { datapoints: [] } unless from && to
+              if params[:duration] == "hour"
+                to = Utils.floor_5min(Time.now)
+                from = to - 1.hour + 5.minutes
+                precision = "5min"
+                delta = 5.minutes
               elsif params[:duration] == "day"
                 to = Time.now.beginning_of_hour
                 from = to - 1.day + 1.hour
                 precision = "hour"
                 delta = 1.hour
-              elsif params[:duration] == "hour"
-                to = Utils.floor_5min(Time.now)
-                from = to - 1.hour + 5.minutes
-                precision = "5min"
-                delta = 5.minutes
+              elsif params[:duration] == "history"
+                to = Time.now.beginning_of_day
+                from = @metric.aggregations.where(precision: "daily").order_by("at" => "asc").first.try(:at) || to
+                precision = "daily"
+                delta = 1.day
               end
 
               data = @metric.aggregations.where(

data/lib/snowman-io/api/profile.rb

@@ -0,0 +1,42 @@
+module SnowmanIO
+  module API
+    class Profile < Grape::API
+      before(&:authenticate!)
+
+      namespace :users do
+        params do
+          requires :name, type: String
+        end
+        post "profile/update_name" do
+          authenticate!
+          current_user.update_attributes!(name: permitted_params[:name])
+          { user: current_user }
+        end
+
+        params do
+          requires :email, type: String
+        end
+        post "profile/update_email" do
+          authenticate!
+          new_email = permitted_params[:email]
+          if User.ne(id: current_user.id).where(email: new_email).empty?
+            current_user.update_attributes!(email: new_email)
+            { user: current_user }
+          else
+            status 400
+            { message: "Duplicate email" }
+          end
+        end
+
+        params do
+          requires :password, type: String
+        end
+        post "profile/update_password" do
+          authenticate!
+          current_user.update_attributes!(password: permitted_params[:password])
+          { user: current_user }
+        end
+      end
+    end
+  end
+end

data/lib/snowman-io/api/users.rb

@@ -20,38 +20,6 @@ module SnowmanIO
           end
         end
 
-        params do
-          requires :token, type: String
-        end
-        post "check_invite" do
-          {
-            correct: !!(
-              permitted_params[:token].present? &&
-              User.where(status: "wait_invite", invite_token: permitted_params[:token]).first
-            )
-          }
-        end
-
-        params do
-          requires :token, type: String
-          requires :name, type: String
-          requires :password, type: String
-        end
-        post "accept_invite" do
-          if permitted_params[:token].present? && (user = User.where(status: "wait_invite", invite_token: permitted_params[:token]).first)
-            user.update_attributes!(
-              name: permitted_params[:name],
-              password: permitted_params[:password],
-              status: "active",
-              invite_token: ""
-            )
-            { user: user }
-          else
-            status 400
-            { message: "SnowmanIO bad accept_invite request" }
-          end
-        end
-
         desc "User Signin"
         params do
           requires :user, type: Hash do
@@ -62,7 +30,7 @@ module SnowmanIO
         post "login" do
           email = permitted_params[:user][:email]
           password = permitted_params[:user][:password]
-          if (user = User.where(email: email).first) && password.present? && user.authenticate(password)
+          if (user = User.where(status: "active", email: email).first) && password.present? && user.authenticate(password)
             { token: user.authentication_token, email: user.email, user_id: user.id.to_s }
           else
             status 400
@@ -74,21 +42,34 @@ module SnowmanIO
           requires :email, type: String
         end
         post "restore_password" do
-          if user = User.where(email: permitted_params[:email]).first
+          if user = User.where(status: "active", email: permitted_params[:email]).first
             user.restore_password!
-            {}
+            { status: "ok" }
           else
             status 400
             { message: "Unknown email" }
           end
         end
 
+        params do
+          requires :token, type: String
+        end
+        post "check_pass_token" do
+          {
+            correct: !!(
+              permitted_params[:token].present? &&
+              User.where(status: "active", restore_pass_token: permitted_params[:token]).first
+            )
+          }
+        end
+
         params do
           requires :token, type: String
           requires :password, type: String
         end
         post "reset_password" do
-          if permitted_params[:token].present? && (user = User.where(status: "active", restore_pass_token: permitted_params[:token]).first)
+          token = permitted_params[:token]
+          if token.present? && (user = User.where(status: "active", restore_pass_token: token).first)
             user.update_attributes!(
               password: permitted_params[:password],
               restore_pass_token: ""
@@ -100,131 +81,16 @@ module SnowmanIO
           end
         end
 
-        desc "Follow user"
-        post ":id/follow" do
-          authenticate!
-          user = User.find(params[:id])
-          current_user.follow!(user)
-          user.touch
-          current_user.touch
-          { users: [current_user, user] }
-        end
-
-        desc "Unfollow user"
-        post ":id/unfollow" do
-          authenticate!
-          user = User.find(params[:id])
-          current_user.unfollow!(user)
-          user.touch
-          current_user.touch
-          { users: [current_user, user] }
-        end
-
         post ":id/destroy" do
           authenticate!
-          user = User.find(params[:id])
-          Extra::Meteor.model_destroy(User, user)
-          { }
-        end
-
-        params do
-          requires :email, type: String
-        end
-        post "invite" do
-          authenticate!
-          if User.where(email: permitted_params[:email]).empty?
-            user = User.create!(
-              email: permitted_params[:email],
-              password: SecureRandom.hex,
-              status: "wait_invite"
-            )
-            user.invite!(current_user)
-            { user: user }
+          if user = User.where(id: params[:id]).first
+            Extra::Meteor.model_destroy(user)
+            { status: "ok"}
           else
             status 400
-            { message: "wrong invite request" }
+            { status: "failed", message: "Wrong id" }
           end
         end
-
-        post ":id/cancel_invite" do
-          authenticate!
-          user = User.where(status: "wait_invite").find(params[:id])
-
-          if user.invite_token.present?
-            user.destroy
-            { }
-          else
-            status 400
-            { message: "wrong invite cancel request" }
-          end
-        end
-
-        post ":id/resend_invite" do
-          authenticate!
-          user = User.where(status: "wait_invite").find(params[:id])
-
-          if user.invite_token.present?
-            user.invite!(current_user)
-            { user: user }
-          else
-            status 400
-            { message: "wrong invite resend request" }
-          end
-        end
-
-        params do
-          requires :value, type: Boolean
-        end
-        post "profile/daily_report" do
-          authenticate!
-          current_user.update_attributes!(daily_report: permitted_params[:value])
-          { user: current_user }
-        end
-
-        params do
-          requires :name, type: String
-        end
-        post "profile/update_name" do
-          authenticate!
-          current_user.update_attributes!(name: permitted_params[:name])
-          { user: current_user }
-        end
-
-        params do
-          requires :email, type: String
-        end
-        post "profile/update_email" do
-          authenticate!
-          new_email = permitted_params[:email]
-          if User.ne(_id: current_user._id).where(email: new_email).empty?
-            current_user.update_attributes!(email: new_email)
-            { user: current_user }
-          else
-            status 400
-            { message: "Duplicate email" }
-          end
-        end
-
-        params do
-          requires :password, type: String
-        end
-        post "profile/update_password" do
-          authenticate!
-          current_user.update_attributes!(password: permitted_params[:password])
-          { }
-        end
-
-        params do
-          requires :token, type: String
-        end
-        post "check_pass_token" do
-          {
-            correct: !!(
-              permitted_params[:token].present? &&
-              User.where(status: "active", restore_pass_token: permitted_params[:token]).first
-            )
-          }
-        end
       end
     end
   end