one-eye-eater 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15d875cdefe5e55f690d6f0993b5a288e200d062
-  data.tar.gz: 7de1ff7280e8bbcea30d709ca98e8178822f3777
+  metadata.gz: 1bd63393c74c6d9ec51fe0a27d8773ea028e9a9c
+  data.tar.gz: 4efd474e011166f6295f35189b1dc8e63abd354d
 SHA512:
-  metadata.gz: 535c0bba71f0f4b803a7594609bf6b432982d6a7f23795f71d18d72e3a9e8ddd1639379753f9f99567888a38cf7759947db22b95f987280e66e3d16a5112e124
-  data.tar.gz: e51c74aff296c00874e317d8ce09bc887d45bee90cc797b294c312874de82ed4858c9cf45d1d36e130b0b4e5d5fbf873b457a39f893f35c0cb2aa3e88d93085c
+  metadata.gz: 503a66b8233ca434b6fbf25cb369c62b7c8c486a0db1f13a940c6549c88b03271b08371a91b3b2980ebda19fe80209db570dae93b3669ebe757cac8f7a307e89
+  data.tar.gz: 4ecf97a4392e9fe9d33cd6fa868b51df263178ce7bfcb9563abf5cb8e2be9fe631ef99b4e2b2c7b249469f34e504bc7e7a15137e3be0f1ebc992e93a7db1fd6e

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.11

data/lib/api.rb

@@ -8,10 +8,16 @@ module OneEye
     def self.http_methods
       [:get, :post, :put, :patch, :delete]
     end
+
     def initialize(api_token=ENV["ONE_EYE_API_KEY"])
       @options = { query: {api_token: api_token} }
     end
 
+    def self.debug(options={})
+      OneEye::API.debug_output $stdout unless options[:stop]
+      OneEye::API.debug_output $stderr if     options[:stop]
+    end
+
     http_methods.each do |method_name|
       define_method method_name do |name, options|
         name, options = standardize_request(method_name, name, options)
@@ -40,9 +46,11 @@ module OneEye
       if options.class == Fixnum
         options = {id: options}
       end
-      options[:body]    = options.to_json
-      options[:headers] = {"Content-Type"=>"application/json"}
-      @options.merge(options)
+      options.each { |k, v| @options[k] ||= v }
+      @options[:query]   = @options[:query].merge(options)
+      @options[:body]    = options.to_json
+      @options[:headers] = {"Content-Type"=>"application/json"}
+      @options
     end
   end
 end

data/lib/models/base.rb

@@ -23,7 +23,8 @@ module OneEye
     end
 
     def attributes
-      self.class.attributes.inject Hash.new do |attributes, key|
+      instance_variables.inject Hash.new do |attributes, key|
+        key = key.to_s.gsub(/\@/) { "" }
         attributes[key] = send key
         attributes
       end
@@ -58,7 +59,10 @@ module OneEye
     end
 
     def non_nil_attributes
-      attributes.reject { |key, value| value.nil? }
+      instance_variables.inject Hash.new do |obj, key|
+        obj[key.to_s[1..-1].to_sym] = instance_variable_get(key) unless instance_variable_get(key).nil?
+        obj
+      end
     end
 
     def api
@@ -73,5 +77,15 @@ module OneEye
     def self.resources_url
       self.name.gsub(/\w+\:\:/) {}.downcase.pluralize
     end
+
+    def method_missing(name, *args, &block)
+      if name[-1] == "="
+        instance_variable_set "@#{name[0..-2]}", args[0]
+      elsif instance_variable_get "@#{name}"
+        instance_variable_get "@#{name}"
+      else
+        super
+      end
+    end
   end
 end

data/lib/models/district.rb

@@ -2,11 +2,5 @@ require_relative "./base"
 
 module OneEye
   class District < OneEye::Base
-    def self.attributes
-      [:id, :name, :url, :abbreviated_name, :motto, :lead_title, :address, :zip_code,
-       :city, :county, :state, :website, :phone_number, :country_id, :avatars, :lead]
-    end
-
-    attr_accessor *self.attributes
   end
 end

data/lib/models/school.rb

@@ -2,12 +2,5 @@ require_relative "./base"
 
 module OneEye
   class School < OneEye::Base
-    def self.attributes
-      [:id, :name, :url, :abbreviated_name, :motto, :start_level, :end_level, :lead_title, 
-       :lead, :district_id, :address, :zip_code, :city, :county, :state, :website, :phone_number, 
-       :code_contact, :code_email, :code_phone_number, :join_code, :avatars, :country_id, :latitude, :longitude]
-    end
-
-    attr_accessor *self.attributes
   end
 end

data/lib/models/user.rb

@@ -2,11 +2,5 @@ require_relative "./base"
 
 module OneEye
   class User < OneEye::Base
-    def self.attributes
-      [:id, :url, :type, :username, :user_title, :first_name, :last_name, :locale, :time_zone, :email, :avatars, :school, :school_id, :district, :district_id, 
-       :admin_rights, :utc_offset, :verified_institution_member, :status_code]
-    end
-
-    attr_accessor *self.attributes
   end
 end

data/one-eye-eater.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: one-eye-eater 0.1.10 ruby lib
+# stub: one-eye-eater 0.1.11 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "one-eye-eater"
-  s.version = "0.1.10"
+  s.version = "0.1.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -38,9 +38,7 @@ Gem::Specification.new do |s|
     "spec/mock_urls.rb",
     "spec/models/base_spec.rb",
     "spec/one_eye_spec.rb",
-    "spec/spec_helper.rb",
-    "test/helper.rb",
-    "test/test_one_eye.rb"
+    "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/brettshollenberger/one-eye-eater"
   s.licenses = ["MIT"]

data/spec/models/base_spec.rb

@@ -21,6 +21,11 @@ describe OneEye::Base do
     expect(@schools.first.abbreviated_name).to eq("OVOXO")
   end
 
+  it "appropriately sets query key to where" do
+    @schools = OneEye::School.where(:district_id => 21417, :query => "october")
+    expect(@schools.first.name).to eq("October's Very Own School")
+  end
+
   # Commented out to avoid creating a bunch of instances
   # describe "Creating and destroying" do
   #   before(:each) do
@@ -37,7 +42,7 @@ describe OneEye::Base do
   #   end
   # end
 
-  it "updates instances" do
+  it "updates instances", :create => true do
     @district = OneEye::District.new(:id => 21417)
     expect(@district.update(:motto => "Get Money Get Paid").motto).to eq("Get Money Get Paid")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: one-eye-eater
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Brett Shollenberger
@@ -206,8 +206,6 @@ files:
 - spec/models/base_spec.rb
 - spec/one_eye_spec.rb
 - spec/spec_helper.rb
-- test/helper.rb
-- test/test_one_eye.rb
 homepage: http://github.com/brettshollenberger/one-eye-eater
 licenses:
 - MIT

data/test/helper.rb

@@ -1,34 +0,0 @@
-require 'simplecov'
-
-module SimpleCov::Configuration
-  def clean_filters
-    @filters = []
-  end
-end
-
-SimpleCov.configure do
-  clean_filters
-  load_adapter 'test_frameworks'
-end
-
-ENV["COVERAGE"] && SimpleCov.start do
-  add_filter "/.rvm/"
-end
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'one_eye'
-
-class Test::Unit::TestCase
-end

data/test/test_one_eye.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestOneEye < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end