ruby_odata 0.0.7 → 0.0.8

data/lib/ruby_odata/version.rb

@@ -0,0 +1,3 @@
+module OData
+  VERSION = "0.0.8"
+end

data/ruby_odata.gemspec

@@ -1,85 +1,31 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "ruby_odata/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{ruby_odata}
-  s.version = "0.0.7"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Damien White"]
-  s.date = %q{2010-07-04}
+  s.name        = "ruby_odata"
+  s.version     = OData::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Damien White"]
+  s.email       = ["damien.white@visoftinc.com"]
+  s.homepage    = %q{http://github.com/visoft/ruby_odata}
+  s.summary     = %q{Ruby consumer of OData services.}
   s.description = %q{An OData Client Library for Ruby.  Use this to interact with OData services}
-  s.email = %q{damien.white@visoftinc.com}
-  s.extra_rdoc_files = [
-    "CHANGELOG.rdoc",
-     "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "CHANGELOG.rdoc",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "config/cucumber.yml",
-     "features/batch_request.feature",
-     "features/complex_types.feature",
-     "features/query_builder.feature",
-     "features/service.feature",
-     "features/service_manage.feature",
-     "features/step_definitions/service_steps.rb",
-     "features/support/env.rb",
-     "features/support/hooks.rb",
-     "features/type_conversion.feature",
-     "lib/ruby_odata.rb",
-     "lib/ruby_odata/class_builder.rb",
-     "lib/ruby_odata/operation.rb",
-     "lib/ruby_odata/query_builder.rb",
-     "lib/ruby_odata/service.rb",
-     "ruby_odata.gemspec",
-     "test/Cassini x64.bat",
-     "test/Cassini x86.bat",
-     "test/SampleService/App_Code/AuditFields.cs",
-     "test/SampleService/App_Code/Entities.cs",
-     "test/SampleService/App_Code/Model.Designer.cs",
-     "test/SampleService/App_Code/Model.edmx",
-     "test/SampleService/App_Code/ModelContainerExtended.cs",
-     "test/SampleService/App_Data/_TestDB.mdf",
-     "test/SampleService/App_Data/_TestDB_Log.ldf",
-     "test/SampleService/Entities.svc",
-     "test/SampleService/web.config",
-     "test/blueprints.rb"
-  ]
-  s.homepage = %q{http://github.com/visoft/ruby_odata}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{ruby-odata}
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Ruby consumer of OData services.}
-  s.test_files = [
-    "test/blueprints.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = "ruby-odata"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.5"])
-      s.add_runtime_dependency(%q<rest-client>, [">= 1.5.1"])
-      s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.2"])
-    else
-      s.add_dependency(%q<activesupport>, [">= 2.3.5"])
-      s.add_dependency(%q<rest-client>, [">= 1.5.1"])
-      s.add_dependency(%q<nokogiri>, [">= 1.4.2"])
-    end
-  else
-    s.add_dependency(%q<activesupport>, [">= 2.3.5"])
-    s.add_dependency(%q<rest-client>, [">= 1.5.1"])
-    s.add_dependency(%q<nokogiri>, [">= 1.4.2"])
-  end
-end
+  s.add_dependency('activesupport', '>= 2.3.5')
+  s.add_dependency('rest-client', '>= 1.5.1')
+  s.add_dependency('nokogiri', '>= 1.4.2')
+  
+  s.add_development_dependency('rspec')
+  s.add_development_dependency('cucumber')
+  s.add_development_dependency('sham')
+  s.add_development_dependency('faker')
+  s.add_development_dependency('machinist')
 
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

data/test/SampleService/App_Code/Entities.cs

@@ -3,6 +3,10 @@ using System.Data.Services.Common;
 using System.ServiceModel;
 using System.ServiceModel.Web;
 using System.Web;
+using System;
+using System.Linq;   
+using System.Security.Principal;
+using System.Text;
 using Model;
 
 [ServiceBehavior(IncludeExceptionDetailInFaults = true)]
@@ -29,14 +33,113 @@ public class Entities : DataService< ModelContainer >
         context.ExecuteStoreCommand("ALTER TABLE [dbo].[Products] ADD CONSTRAINT [FK_CategoryProduct] FOREIGN KEY ([Category_Id]) REFERENCES [dbo].[Categories]([Id])");
 
     }
-
+    
     protected override void OnStartProcessingRequest(ProcessRequestArgs args)
     {
         base.OnStartProcessingRequest(args);
         if (args.RequestUri.AbsoluteUri.ToLower().EndsWith("cleandatabasefortesting"))
         {
-            if (HttpContext.Current.Request.UserHostAddress != "127.0.0.1")
+            var hostAddress = HttpContext.Current.Request.UserHostAddress;
+            if (hostAddress != "127.0.0.1" && hostAddress != "::1")
                 throw new DataServiceException(401, "Access Denied");
         }
     }
 }
+ 
+public class OurBasicAuthenticationModule: IHttpModule 
+{ 
+    public void Init(HttpApplication context) 
+    { 
+        context.AuthenticateRequest 
+           += new EventHandler(context_AuthenticateRequest); 
+    }
+     
+    void context_AuthenticateRequest(object sender, EventArgs e) 
+    { 
+        HttpApplication application = (HttpApplication)sender; 
+
+        // Only require authentication if BasicAuth is in the URI path
+        if (( application.Context.Request.Url.AbsoluteUri.Contains("BasicAuth")) &&
+            (!CustomBasicAuthenticationProvider.Authenticate(application.Context))) 
+        { 
+            application.Context.Response.Status = "401 Unauthorized"; 
+            application.Context.Response.StatusCode = 401; 
+            application.Context.Response.AddHeader("WWW-Authenticate", "Basic"); 
+            application.CompleteRequest(); 
+        } 
+    }
+
+    public void Dispose() { }
+
+}    // class OurBasicAuthenticationModule: IHttpModule 
+
+public class CustomBasicAuthenticationProvider
+{
+    public static bool Authenticate(HttpContext context) 
+    {      
+        if (!HttpContext.Current.Request.Headers.AllKeys.Contains("Authorization")) 
+            return false;
+    
+        string authHeader = HttpContext.Current.Request.Headers["Authorization"];
+    
+        IPrincipal principal; 
+        if (TryGetPrincipal(authHeader, out principal)) 
+        { 
+            HttpContext.Current.User = principal; 
+            return true; 
+        } 
+        return false; 
+    } 
+
+    private static bool TryGetPrincipal(string authHeader, out IPrincipal principal) 
+    { 
+        var creds = ParseAuthHeader(authHeader); 
+        if (creds != null && TryGetPrincipal(creds, out principal)) 
+            return true;
+    
+        principal = null; 
+        return false; 
+    }
+
+    private static bool TryGetPrincipal(string[] creds,out IPrincipal principal) 
+    { 
+        if (creds[0] == "admin" && creds[1] == "passwd") 
+        { 
+            principal = new GenericPrincipal( 
+               new GenericIdentity("Administrator"), 
+               new string[] {"Administrator", "User"} 
+            ); 
+            return true; 
+        }         
+        else 
+        { 
+            principal = null; 
+            return false; 
+        } 
+    }
+
+    private static string[] ParseAuthHeader(string authHeader) 
+    { 
+        // Check this is a Basic Auth header 
+        if ( 
+            authHeader == null || 
+            authHeader.Length == 0 || 
+            !authHeader.StartsWith("Basic") 
+        ) return null;
+    
+        // Pull out the Credentials with are seperated by ':' and Base64 encoded 
+        // Won't handle password with : in it, but that's OK for these tests
+        string base64Credentials = authHeader.Substring(6); 
+        string[] credentials = Encoding.ASCII.GetString( 
+              Convert.FromBase64String(base64Credentials) 
+        ).Split(new char[] { ':' }); 
+    
+        if (credentials.Length != 2 || 
+            string.IsNullOrEmpty(credentials[0]) || 
+            string.IsNullOrEmpty(credentials[0]) 
+        ) return null;
+            
+        return credentials; 
+    }    
+
+}    // class CustomBasicAuthenticationProvider

data/test/SampleService/App_Code/Model.Designer.cs

@@ -365,6 +365,30 @@ namespace Model
         private global::System.Decimal _Price;
         partial void OnPriceChanging(global::System.Decimal value);
         partial void OnPriceChanged();
+    
+        /// <summary>
+        /// No Metadata Documentation available.
+        /// </summary>
+        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=true)]
+        [DataMemberAttribute()]
+        public Nullable<global::System.DateTime> DiscontinuedDate
+        {
+            get
+            {
+                return _DiscontinuedDate;
+            }
+            set
+            {
+                OnDiscontinuedDateChanging(value);
+                ReportPropertyChanging("DiscontinuedDate");
+                _DiscontinuedDate = StructuralObject.SetValidValue(value);
+                ReportPropertyChanged("DiscontinuedDate");
+                OnDiscontinuedDateChanged();
+            }
+        }
+        private Nullable<global::System.DateTime> _DiscontinuedDate;
+        partial void OnDiscontinuedDateChanging(Nullable<global::System.DateTime> value);
+        partial void OnDiscontinuedDateChanged();
 
         #endregion
         #region Complex Properties

data/test/SampleService/App_Code/Model.edmx

@@ -32,6 +32,7 @@
           <Property Name="CreateDate" Type="datetime" Nullable="false" />
           <Property Name="ModifiedDate" Type="datetime" Nullable="false" />
           <Property Name="CreatedBy" Type="nvarchar" MaxLength="50" />
+          <Property Name="DiscontinuedDate" Type="datetime" />
         </EntityType>
         <Association Name="FK_CategoryProduct">
           <End Role="Categories" Type="Model.Store.Categories" Multiplicity="1" />
@@ -67,6 +68,7 @@
           <Property Type="Decimal" Name="Price" Nullable="false" />
           <NavigationProperty Name="Category" Relationship="Model.CategoryProduct" FromRole="Product" ToRole="Category" />
           <Property Name="AuditFields" Type="Model.AuditFields" Nullable="false" />
+          <Property Type="DateTime" Name="DiscontinuedDate" Nullable="true" />
         </EntityType>
         <EntityType Name="Category">
           <Key>
@@ -94,6 +96,7 @@
     <EntitySetMapping Name="Products">
       <EntityTypeMapping TypeName="IsTypeOf(Model.Product)">
         <MappingFragment StoreEntitySet="Products">
+                <ScalarProperty Name="DiscontinuedDate" ColumnName="DiscontinuedDate" />
                 <ScalarProperty Name="Id" ColumnName="Id" />
           <ScalarProperty Name="Name" ColumnName="Name" />
           <ScalarProperty Name="Description" ColumnName="Description" />

data/test/SampleService/BasicAuth/Entities.svc

@@ -0,0 +1 @@
+<%@ ServiceHost Language="C#" Factory="System.Data.Services.DataServiceHostFactory" Service="Entities" %>

data/test/SampleService/web.config

@@ -4,6 +4,14 @@
   http://go.microsoft.com/fwlink/?LinkId=169433
   -->
 <configuration>
+
+  <system.webServer> 
+    <modules> 
+      <add name="OurBasicAuthenticationModule" 
+         type="OurBasicAuthenticationModule"/> 
+    </modules> 
+  </system.webServer>
+
   <system.web>
     <compilation debug="true" targetFramework="4.0">
       <assemblies>
@@ -24,4 +32,6 @@
   <system.serviceModel>
     <serviceHostingEnvironment aspNetCompatibilityEnabled="true" />
   </system.serviceModel>
-</configuration>
+</configuration>
+
+  

data/test/blueprints.rb

@@ -1,21 +1,21 @@
-Sham.define do
-  category_name  					{ |i| "Category #{i}" }
-  product_name 						{ |i| "Widget #{i}" }
-  price(:unique => false)	{ ['5.00', '10.00', '20.00', '15.00' , '25.00', '7.50'].rand }
-end
-
-Product.blueprint do
-	Name					{ Sham.product_name }
-	Description		"Test Widget"
-	Price					{ Sham.price }
-	Category			{ Category.make }
-	AuditFields   { AuditFields.make }
-end
-
-Category.blueprint do
-	Name					{ Sham.category_name }
-end
-
-AuditFields.blueprint do
-  CreatedBy     "Cucumber"
+Sham.define do
+  category_name           { |i| "Category #{i}" }
+  product_name            { |i| "Widget #{i}" }
+  price(:unique => false) { ['5.00', '10.00', '20.00', '15.00' , '25.00', '7.50'].rand }
+end
+
+Product.blueprint do
+  Name          { Sham.product_name }
+  Description   "Test Widget"
+  Price         { Sham.price }
+  Category      { Category.make }
+  AuditFields   { AuditFields.make }
+end
+
+Category.blueprint do
+  Name          { Sham.category_name }
+end
+
+AuditFields.blueprint do
+  CreatedBy     "Cucumber"
 end

data/test/iisExpress x64.bat

@@ -0,0 +1 @@
+"%ProgramFiles(x86)%\iis express\iisexpress" /port:8888 /path:"%~dp0SampleService" /vpath:"/SampleService"

data/test/iisExpress x86.bat

@@ -0,0 +1 @@
+"%ProgramFiles%\iis express\iisexpress" /port:8888 /path:"%~dp0SampleService" /vpath:"/SampleService"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_odata
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Damien White
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-04 00:00:00 -04:00
+date: 2011-03-12 23:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,24 +66,94 @@ dependencies:
         version: 1.4.2
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: sham
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: faker
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: machinist
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
 description: An OData Client Library for Ruby.  Use this to interact with OData services
-email: damien.white@visoftinc.com
+email: 
+- damien.white@visoftinc.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- CHANGELOG.rdoc
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .gitignore
 - CHANGELOG.rdoc
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - config/cucumber.yml
+- features/basic_auth.feature
 - features/batch_request.feature
 - features/complex_types.feature
 - features/query_builder.feature
@@ -98,6 +168,7 @@ files:
 - lib/ruby_odata/operation.rb
 - lib/ruby_odata/query_builder.rb
 - lib/ruby_odata/service.rb
+- lib/ruby_odata/version.rb
 - ruby_odata.gemspec
 - test/Cassini x64.bat
 - test/Cassini x86.bat
@@ -108,16 +179,19 @@ files:
 - test/SampleService/App_Code/ModelContainerExtended.cs
 - test/SampleService/App_Data/_TestDB.mdf
 - test/SampleService/App_Data/_TestDB_Log.ldf
+- test/SampleService/BasicAuth/Entities.svc
 - test/SampleService/Entities.svc
 - test/SampleService/web.config
 - test/blueprints.rb
+- test/iisExpress x64.bat
+- test/iisExpress x86.bat
 has_rdoc: true
 homepage: http://github.com/visoft/ruby_odata
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -145,5 +219,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby consumer of OData services.
-test_files: 
-- test/blueprints.rb
+test_files: []
+